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

src/api/advice.js

@@ -1,91 +1,89 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 export function getAdviceConfig(type) {
   return request({
-    url: "/api/getadviceconfigs?type=" + type,
-    method: "get"
-  });
+    url: '/api/getadviceconfigs?type=' + type,
+    method: 'get'
+  })
 }
 
 export function getAllAdviceConfig() {
   return request({
-    url: "/api/getalladviceconfig",
-    method: "get"
-  });
+    url: '/api/getalladviceconfig',
+    method: 'get'
+  })
 }
 
 export function CreateDoctorAdvice(id, advice, mode) {
-
   return request({
-    url: "/api/patients/advice/create?id=" + id + "&mode=" + mode,
-    method: "post",
+    url: '/api/patients/advice/create?id=' + id + '&mode=' + mode,
+    method: 'post',
     data: advice,
     headers: {
       Permission: 3
     }
-  });
+  })
 }
 
 export function EditDoctorAdvice(patient, id, advice, mode) {
   return request({
     url:
-      "/api/patients/advice/edit?id=" +
+      '/api/patients/advice/edit?id=' +
       id +
-      "&patient=" +
+      '&patient=' +
       patient +
-      "&mode=" +
+      '&mode=' +
       mode,
-    method: "Put",
+    method: 'Put',
     data: advice,
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
-export function ExecDoctorAdvice(patient, id, time, mode,origin) {
-
+export function ExecDoctorAdvice(patient, id, time, mode, origin) {
   var params = {
     id: id,
     patient: patient,
     execution_time: time,
     mode: mode,
-    origin:origin,
-  };
- 
+    origin: origin
+  }
+
   return request({
-    url: "/api/patients/advice/exec",
-    method: "Post",
+    url: '/api/patients/advice/exec',
+    method: 'Post',
     params: params,
     headers: {
       Permission: 2
     }
-  });
+  })
 }
-export function  CheckDoctorAdvice(patient, id, mode,origin) {
+export function CheckDoctorAdvice(patient, id, mode, origin) {
   var params = {
     id: id,
     patient: patient,
     mode: mode,
-    origin:origin,
+    origin: origin
     // execution_time: time,
-  };
+  }
   return request({
-    url: "/api/patients/advice/check",
-    method: "Post",
+    url: '/api/patients/advice/check',
+    method: 'Post',
     params: params,
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function getDoctorAdviceList(params) {
   return request({
-    url: "/api/patients/advices",
-    method: "Get",
+    url: '/api/patients/advices',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 // export function StopDoctorAdvice(id, reason,mode) {
@@ -100,407 +98,400 @@ export function getDoctorAdviceList(params) {
 
 export function StopGroupAdvice(groupno, reason, mode) {
   return request({
-    url: "/api/patients/advice/stopgroup?groupno=" + groupno + "&mode=" + mode,
-    method: "Post",
+    url: '/api/patients/advice/stopgroup?groupno=' + groupno + '&mode=' + mode,
+    method: 'Post',
     data: reason,
     headers: {
       Permission: 3
     }
-  });
+  })
 }
 
 export function DeleteDoctorAdvice(id, mode) {
   return request({
-    url: "/api/patients/advice/delete?id=" + id + "&mode=" + mode,
-    method: "Delete",
+    url: '/api/patients/advice/delete?id=' + id + '&mode=' + mode,
+    method: 'Delete',
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function CreateDrugDic(data) {
   return request({
-    url: "/api/drugdic/create",
-    method: "post",
+    url: '/api/drugdic/create',
+    method: 'post',
     data: data
-  });
+  })
 }
 export function UpdateDrugDic(id, data) {
   return request({
-    url: "/api/drugdic/update?id=" + id,
-    method: "put",
+    url: '/api/drugdic/update?id=' + id,
+    method: 'put',
     data: data
-  });
+  })
 }
 export function DeleteDrugDic(id) {
   return request({
-    url: "/api/drugdic/delete?id=" + id,
-    method: "delete"
-  });
+    url: '/api/drugdic/delete?id=' + id,
+    method: 'delete'
+  })
 }
 
 export function CreateDrugWay(data) {
   return request({
-    url: "/api/drugway/create",
-    method: "post",
+    url: '/api/drugway/create',
+    method: 'post',
     data: data
-  });
+  })
 }
 
 export function UpdateDrugWay(id, data) {
   return request({
-    url: "/api/drugway/update?id=" + id,
-    method: "put",
+    url: '/api/drugway/update?id=' + id,
+    method: 'put',
     data: data
-  });
+  })
 }
 export function DeleteDrugWay(id) {
   return request({
-    url: "/api/drugway/delete?id=" + id,
-    method: "delete"
-  });
+    url: '/api/drugway/delete?id=' + id,
+    method: 'delete'
+  })
 }
 
 export function CreateExecutionFrequency(data) {
   return request({
-    url: "/api/executionfrequency/create",
-    method: "post",
+    url: '/api/executionfrequency/create',
+    method: 'post',
     data: data
-  });
+  })
 }
 
 export function UpdateExecutionFrequency(id, data) {
   return request({
-    url: "/api/executionfrequency/update?id=" + id,
-    method: "put",
+    url: '/api/executionfrequency/update?id=' + id,
+    method: 'put',
     data: data
-  });
+  })
 }
 export function DeleteExecutionFrequency(id) {
   return request({
-    url: "/api/executionfrequency/delete?id=" + id,
-    method: "delete"
-  });
+    url: '/api/executionfrequency/delete?id=' + id,
+    method: 'delete'
+  })
 }
 export function CreateAdviceTemplate(data) {
   return request({
-    url: "/api/advicetemplate/create",
-    method: "post",
+    url: '/api/advicetemplate/create',
+    method: 'post',
     data: data
-  });
+  })
 }
 
-export function UpdateAdviceTemplate(id, data,drug_id) {
-
+export function UpdateAdviceTemplate(id, data, drug_id) {
   return request({
-    url: "/api/advicetemplate/update?id=" + id+"&drug_id="+drug_id,
-    method: "put",
+    url: '/api/advicetemplate/update?id=' + id + '&drug_id=' + drug_id,
+    method: 'put',
     data: data
-  });
+  })
 }
 export function DeleteAdviceTemplate(id, template_id, parent_id) {
   return request({
     url:
-      "/api/advicetemplate/delete?id=" +
+      '/api/advicetemplate/delete?id=' +
       id +
-      "&template_id=" +
+      '&template_id=' +
       template_id +
-      "&parent_id=" +
+      '&parent_id=' +
       parent_id,
-    method: "delete"
-  });
+    method: 'delete'
+  })
 }
 
-export function postAdviceTemplate(params, name,sort, advice_type) {
+export function postAdviceTemplate(params, name, sort, advice_type) {
   return request({
     url:
-      "/api/advicetemplate/create?template_name=" +
+      '/api/advicetemplate/create?template_name=' +
       name +
-      "&advice_type=" +
-      advice_type
-      +"&sort="+sort,
-    method: "post",
+      '&advice_type=' +
+      advice_type +
+      '&sort=' + sort,
+    method: 'post',
     data: params
-  });
+  })
 }
 
 export function CreateGroupAdvice(id, groupno, advices, mode) {
-
   if (advices.remind > 0) {
     return request({
       url:
-        "/api/patients/advice/creategroup?id=" +
+        '/api/patients/advice/creategroup?id=' +
         id +
-        "&groupno=" +
+        '&groupno=' +
         groupno +
-        "&mode=" +
+        '&mode=' +
         mode,
-      method: "post",
+      method: 'post',
       data: advices,
       headers: {
         Permission: 2
       }
-    });
+    })
   } else {
     return request({
       url:
-        "/api/patients/advice/creategroup?id=" +
+        '/api/patients/advice/creategroup?id=' +
         id +
-        "&groupno=" +
+        '&groupno=' +
         groupno +
-        "&mode=" +
+        '&mode=' +
         mode,
-      method: "post",
+      method: 'post',
       data: advices,
       headers: {
         Permission: 2
       }
-    });
+    })
   }
 }
 export function DeleteGroupAdvice(groupno, mode) {
   return request({
     url:
-      "/api/patients/advice/deletegroup?groupno=" + groupno + "&mode=" + mode,
-    method: "delete",
+      '/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
+    method: 'delete',
     headers: {
       Permission: 3
     }
-  });
+  })
 }
 
 export function getAllAdviceTemplate() {
   return request({
-    url: "/api/advicetemplate/list",
-    method: "get"
-  });
+    url: '/api/advicetemplate/list',
+    method: 'get'
+  })
 }
 
 export function CreateSingleAdviceTemplate(advices) {
   return request({
-    url: "/api/advicetemplate/add",
-    method: "post",
+    url: '/api/advicetemplate/add',
+    method: 'post',
     params: advices
-  });
+  })
 }
 export function DeleteParentAdviceTemplate(id) {
   return request({
-    url: "/api/adviceparenttemplate/delete?template_id=" + id,
-    method: "delete"
-  });
+    url: '/api/adviceparenttemplate/delete?template_id=' + id,
+    method: 'delete'
+  })
 }
 
 export function CreateSubAdvice(params) {
-
   return request({
-    url: "/api/subadvice/create",
-    method: "post",
+    url: '/api/subadvice/create',
+    method: 'post',
     params: params
-  });
+  })
 }
 
 export function updateTemplateName(params) {
   return request({
-    url: "/api/template/modify",
-    method: "post",
+    url: '/api/template/modify',
+    method: 'post',
     params: params
-  });
+  })
 }
 
 export function getDoctorAdviceConfig() {
   return request({
-    url: "/api/adviceconfig/get",
-    method: "get"
-  });
+    url: '/api/adviceconfig/get',
+    method: 'get'
+  })
 }
 
 export function postDoctorAdviceConfig(params) {
   return request({
-    url: "/api/adviceconfig/isopen",
-    method: "post",
+    url: '/api/adviceconfig/isopen',
+    method: 'post',
     params: params
-  });
+  })
 }
 
 export function getDoctorInitConfig() {
   return request({
-    url: "/api/advicetemplate/init/get",
-    method: "get"
-  });
+    url: '/api/advicetemplate/init/get',
+    method: 'get'
+  })
 }
 
 export function PostInitAdviceTemplate(params) {
   return request({
-    url: "/api/advicetemplate/init/commit",
-    method: "post",
+    url: '/api/advicetemplate/init/commit',
+    method: 'post',
     params: params
-  });
+  })
 }
 
 export function getPrintInfo(data) {
   return request({
-    url: "/api/advicetemplate/getprintinfo",
-    method: "post",
+    url: '/api/advicetemplate/getprintinfo',
+    method: 'post',
     data: data
-  });
+  })
 }
 
 export function EditNewDoctorAdvice(patient, id, advice, mode) {
   return request({
     url:
-      "/api/patients/advice/edit?id=" +
+      '/api/patients/advice/edit?id=' +
       id +
-      "&patient=" +
+      '&patient=' +
       patient +
-      "&mode=" +
+      '&mode=' +
       mode,
-    method: "Put",
+    method: 'Put',
     data: advice,
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function CreateNewDoctorAdvice(id, advice, mode) {
-
   return request({
-    url: "/api/patients/advice/create?id=" + id + "&mode=" + mode,
-    method: "post",
+    url: '/api/patients/advice/create?id=' + id + '&mode=' + mode,
+    method: 'post',
     data: advice,
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function CreateNewGroupAdvice(id, groupno, advices, mode) {
   if (advices.remind > 0) {
     return request({
       url:
-        "/api/patients/advice/creategroup?id=" +
+        '/api/patients/advice/creategroup?id=' +
         id +
-        "&groupno=" +
+        '&groupno=' +
         groupno +
-        "&mode=" +
+        '&mode=' +
         mode,
-      method: "post",
+      method: 'post',
       data: advices,
       headers: {
         Permission: 3
       }
-    });
+    })
   } else {
     return request({
       url:
-        "/api/patients/advice/creategroup?id=" +
+        '/api/patients/advice/creategroup?id=' +
         id +
-        "&groupno=" +
+        '&groupno=' +
         groupno +
-        "&mode=" +
+        '&mode=' +
         mode,
-      method: "post",
+      method: 'post',
       data: advices,
       headers: {
         Permission: 3
       }
-    });
+    })
   }
 }
 
 export function DeleteNewDoctorAdvice(id, mode) {
   return request({
-    url: "/api/patients/advice/delete?id=" + id + "&mode=" + mode,
-    method: "Delete",
+    url: '/api/patients/advice/delete?id=' + id + '&mode=' + mode,
+    method: 'Delete',
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function DeleteNewGroupAdvice(groupno, mode) {
   return request({
     url:
-      "/api/patients/advice/deletegroup?groupno=" + groupno + "&mode=" + mode,
-    method: "delete",
+      '/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
+    method: 'delete',
     headers: {
       Permission: 3
     }
-  });
+  })
 }
 
 export function StopDoctorAdvice(id, reason, mode) {
   return request({
-    url: "/api/patients/advice/stop?id=" + id + "&mode=" + mode,
-    method: "Post",
+    url: '/api/patients/advice/stop?id=' + id + '&mode=' + mode,
+    method: 'Post',
     data: reason,
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function ExecGroupAdvice(groupno, time, mode) {
   return request({
     url:
-      "/api/patients/advice/execgroup?groupno=" +
+      '/api/patients/advice/execgroup?groupno=' +
       groupno +
-      "&execution_time=" +
+      '&execution_time=' +
       time +
-      "&mode=" +
+      '&mode=' +
       mode,
-      method: "Post",
-      headers: {
+    method: 'Post',
+    headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function CheckGroupAdvice(groupno, mode) {
   var params = {
     groupno: groupno,
     mode: mode
-  };
+  }
   return request({
-    url: "/api/patients/advice/checkgroup",
-    method: "Post",
+    url: '/api/patients/advice/checkgroup',
+    method: 'Post',
     params: params,
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function getPatientSchedules(id, params) {
   return request({
-    url: "/api/patients/advices/getpatientschedules?id=" + id,
-    method: "get",
+    url: '/api/patients/advices/getpatientschedules?id=' + id,
+    method: 'get',
     params: params
-  });
+  })
 }
 
 export function SaveEditAdvices(params) {
   return request({
-    url: "/api/patients/advices/saveditadvices",
-    method: "get",
+    url: '/api/patients/advices/saveditadvices',
+    method: 'get',
     params: params
-  });
+  })
 }
 
-
-
-
 export function GetLastOrNextDoctorAdvice(params) {
   return request({
-    url: "/api/doctoradvice/get",
-    method: "get",
+    url: '/api/doctoradvice/get',
+    method: 'get',
     params: params
-  });
+  })
 }
 
-export function getSchedualDoctors (params) {
-  
+export function getSchedualDoctors(params) {
+  console.log('中国国323322332232323232323', params)
   return request({
     url: '/api/schedule/advices',
     method: 'get',
@@ -508,15 +499,11 @@ export function getSchedualDoctors (params) {
   })
 }
 
-export function getDoctorAdviceCount(params){
-  
+export function getDoctorAdviceCount(params) {
   return request({
-    url:"/api/schedule/getdoctoradvicecount",
-    method:"get",
-    params:params
+    url: '/api/schedule/getdoctoradvicecount',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -67,7 +67,8 @@
 
         <li v-if="isShow('体液过多症状')">
           <label>体液过多症状 : </label>
-          <span class="content">{{ getHumorExcessiveSymptom(this.record.humor_excessive_symptom) }}</span>
+          <!-- <span class="content">{{ getHumorExcessiveSymptom(this.record.humor_excessive_symptom) }}</span> -->
+          <span>{{this.record.humor_excessive_symptom}}</span>
         </li>
 
         <li v-if="isShow('其他感染情况')">

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

@@ -67,8 +67,6 @@
           </el-col>
 
 
-
-
           <el-col :span="8">
             <el-form-item label="体温(℃)：" v-if="isShow('体温')">
               <el-input type="number" v-model="assessmentBeforeDislysis.temperature"></el-input>
@@ -97,7 +95,7 @@
               <el-input type="number" v-model="assessmentBeforeDislysis.pulse_frequency"></el-input>
             </el-form-item>
           </el-col>
-
+<!-- 
           <el-col :span="8">
             <el-form-item label="体液过多症状： " v-if="isShow('体液过多症状')">
               <el-select v-model="assessmentBeforeDislysis.humor_excessive_symptom">
@@ -106,6 +104,13 @@
                            :key="item.id"></el-option>
               </el-select>
             </el-form-item>
+          </el-col> -->
+
+          <el-col :span="8">
+            <el-form-item label="体液过多症状：" v-if="isShow('体液过多症状')">
+              <el-input v-model="assessmentBeforeDislysis.humor_excessive_symptom" readonly
+                        @focus="showInnerDialog('19')"></el-input>
+            </el-form-item>
           </el-col>
 
           <el-col :span="8">
@@ -402,34 +407,6 @@
             </el-form-item>
           </el-col>
 
-
-
-
-
-
-
-
-
-          <!--          <el-col :span="8" v-if="isShow('血管通路(内瘘)')">-->
-          <!--            <el-form-item label="血管通路(内瘘):">-->
-          <!--              <div>-->
-          <!--                <el-input v-model="assessmentBeforeDislysis.blood_access_internal_fistula"-->
-          <!--                          @focus="showInnerDialog('9')"></el-input>-->
-          <!--              </div>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-
-
-
-
-
-
-
-
-
-
-
-
           <el-col :span="8">
 
             <el-form-item label="位置： " v-if="isShow('位置')">
@@ -443,18 +420,6 @@
             </el-form-item>
           </el-col>
 
-
-
-
-          <!--          <el-col :span="8" v-if="isShow('导管')">-->
-          <!--            <el-form-item label="导管:">-->
-          <!--              <div>-->
-          <!--                <el-input v-model="assessmentBeforeDislysis.ductus_arantii" @focus="showInnerDialog('10')"></el-input>-->
-          <!--              </div>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-
-
           <el-col :span="8" v-if="isShow('其他中心静脉导管')">
             <el-form-item label="其他中心静脉导管:">
               <div>
@@ -462,13 +427,7 @@
               </div>
             </el-form-item>
           </el-col>
-          <!-- </el-row>
-
-
-          <el-row :gutter="20"> -->
-
-
-
+         
           <el-col :span="8">
             <el-form-item label="感染： " v-if="isShow('感染')">
               <el-select v-model="assessmentBeforeDislysis.is_infect">
@@ -1089,6 +1048,16 @@
             this.InnerDialogProps.isShowTextArea = false
 
             break
+
+           case '19': // 内瘘
+
+            this.InnerDialogProps.values = this.humor_excessive_symptom_array
+            this.InnerDialogProps.titles = '体液过多症状'
+            this.InnerDialogProps.type = 'humor_excessive_symptom'
+            this.InnerDialogProps.selected = this.assessmentBeforeDislysis.humor_excessive_symptom
+            this.InnerDialogProps.isShowTextArea = false
+
+            break
          
         }
       },
@@ -1153,11 +1122,15 @@
           case 'catheter_maintenance':
            this.assessmentBeforeDislysis.catheter_maintenance = val.value.join(',')
            break
+          case 'humor_excessive_symptom':
+           this.assessmentBeforeDislysis.humor_excessive_symptom = val.value.join(',')
+           break  
         }
       },
       innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
-      }, handleComfirm: function() {
+      }, 
+      handleComfirm: function() {
 
         var arr = this.assessmentBeforeDislysis
         for (let i = 0; i < this.machineType.length; i++) {
@@ -1165,15 +1138,11 @@
             arr.machine_type = this.machineType[i].name
           }
         }
-        // console.log('arr', arr)
         const ParamsQuery = arr
-        // console.log('paramsquery', ParamsQuery)
         ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
         ParamsQuery['mode'] = '1'
 
-        // console.log(this.predialysis_evaluation)
-
         if (this.predialysis_evaluation.id == 0) {
           ParamsQuery['mode'] = '1'
         } else {
@@ -1226,7 +1195,8 @@
         }
         this.dialogFormVisible = true
         this.isVisibility = false
-      }, submitDryWeight() {
+      },
+     submitDryWeight() {
         const params = {
           id: this.patient.id,
           dry_weight: this.weight_adjust.weight,
@@ -1245,7 +1215,8 @@
             this.isVisibility = true
           }
         })
-      }, cancleDryWeight() {
+      },
+     cancleDryWeight() {
         this.dialogFormVisible = false
         this.isVisibility = true
       },

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -23,10 +23,23 @@
     </div>
     </div>
     <div class="app-container">
-      <!-- <div class="filter-container">
-        <el-input style="width: 400px;" v-model="searchKey" class="filter-item"/>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-      </div>-->
+      <div class="filter-container">
+       <el-autocomplete
+            style="margin:16px 5px"
+            popper-class="my-autocomplete"
+            v-model.trim="listQuery.keyword"
+            :fetch-suggestions="querySearchAsync"
+            :trigger-on-focus="false"
+            placeholder="病人名字或者透析号"
+            @select="handleSelect"
+    >
+        <i class="el-icon-search el-input__icon" slot="suffix"> </i>
+        <template slot-scope="{ item }">
+            <div class="name">{{ item.name }}</div>
+        </template>
+     </el-autocomplete>
+       
+      </div>
       <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询:</span>
@@ -46,6 +59,7 @@
 
         <!-- <el-button type="primary" :disabled="selecting_schs.length == 0" @click="batchPrintAction">打印</el-button> -->
       </div>
+     
       <div class="cell clearfix">
         <label class="title"> <span class="name">排班班次</span> : </label>
         <div class="time">
@@ -359,7 +373,7 @@ import { parseTime } from "@/utils";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { getPrintTemplate } from "@/api/data";
 import { getSchedualDoctors } from '@/api/advice'
-
+import {  getHisPatient } from '@/api/project/project'
 export default {
   name: "Patient",
   data() {
@@ -404,6 +418,7 @@ export default {
       showOne:false,
       deliveryWay:[],
       delivery_way:0,
+      patient_id:0,
     };
   },
   created() {
@@ -506,7 +521,7 @@ export default {
          var partition_type = this.listQuery.partition_type
         
         console.log("班次",schedule_type,"分区",partition_type)
-        getSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type}).then(rs => {
+        getSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser
@@ -972,7 +987,31 @@ export default {
         // console.log('val',val)
         this.selecting_schs = val;
     },
-    
+    querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+
+        var params = {
+          keyword: key
+        }
+        console.log('params', params)
+        getHisPatient(params).then(response => {
+          if (response.data.state == 1) {
+            searchArray = response.data.data.patient
+            console.log('searcharrya', searchArray)
+            cb(searchArray)
+          }
+        })
+        return searchArray
+      },
+     handleSelect(val) {
+     
+        this.patient_id = val.patient_id
+       this.requestSchedualDoctors(this.time)
+      },
   },
   components: {
     BreadCrumb

src/xt_pages/dialysis/template/DialysisPrintOrderFourteen.vue

@@ -174,7 +174,13 @@
                 <tbody>
                   <tr>
                     <td width="100">体液过多症状:</td>
-                    <td width="50">
+                    <td width="400">
+                       <div class="under-line">
+                          &nbsp;
+                          <span>{{ predialysis.humor_excessive_symptom ? predialysis.humor_excessive_symptom : '' }}</span>
+                        </div>
+                    </td>
+                    <!-- <td width="50">
                       <div>
                         <label-box :isChecked="predialysis.humor_excessive_symptom ? getHumorExcessiveSymptom(predialysis.humor_excessive_symptom).indexOf('无') > -1 : false" showValue="无"></label-box>
                       </div>
@@ -186,17 +192,19 @@
                         <label-box :isChecked="predialysis.humor_excessive_symptom ? getHumorExcessiveSymptom(predialysis.humor_excessive_symptom).indexOf('颜面浮肿') >-1 : false" showValue="颜面浮肿"></label-box>
                         &nbsp;
                       </div>
-                    </td>
+                    </td> -->
 
-                    <td width="50"><label-box :isChecked="predialysis.humor_excessive_symptom ? ['无','下肢水肿','颜面浮肿'].indexOf(getHumorExcessiveSymptom(predialysis.humor_excessive_symptom)) == -1 : false" showValue="其它"></label-box></td>
-                    <td width="140">
+                    <!-- <td width="50"><label-box :isChecked="predialysis.humor_excessive_symptom ? ['无','下肢水肿','颜面浮肿'].indexOf(getHumorExcessiveSymptom(predialysis.humor_excessive_symptom)) == -1 : false" showValue="其它"></label-box></td> -->
+                    <!-- <td width="140">
                       <div class="under-line">
                         &nbsp;
                         <span v-if="predialysis.humor_excessive_symptom && ['无','下肢水肿','颜面浮肿'].indexOf(getHumorExcessiveSymptom(predialysis.humor_excessive_symptom)) == -1">
                           {{ getHumorExcessiveSymptom(predialysis.humor_excessive_symptom) }}
                         </span>
                       </div>
-                    </td>
+                    </td> -->
+                    <td></td>
+                    <td></td>
                     <td></td>
                   </tr>
                 </tbody>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -182,16 +182,21 @@
                           <!-- <label-box :isChecked="predialysis.humor_excessive_symptom ? getHumorExcessiveSymptom(predialysis.humor_excessive_symptom).indexOf('无') > -1 : false" showValue="无"></label-box> -->
                         </div>
                       </td>
-                      <td width="180">
-                        <div>
+                      <td width="400">
+                        <!-- <div>
                           <label-box :isChecked="predialysis.humor_excessive_symptom ? getHumorExcessiveSymptom(predialysis.humor_excessive_symptom) == '下肢水肿' : false" showValue="下肢水肿"></label-box>
                           &nbsp;
                           <label-box :isChecked="predialysis.humor_excessive_symptom ? getHumorExcessiveSymptom(predialysis.humor_excessive_symptom).indexOf('颜面浮肿') >-1 : false" showValue="颜面浮肿"></label-box>
                           &nbsp;
+                        </div> -->
+                         <div class="under-line">
+                          &nbsp;
+                          <span>{{ predialysis.humor_excessive_symptom ? predialysis.humor_excessive_symptom : '' }}</span>
                         </div>
+
                       </td>
 
-                      <td width="50"><label-box :isChecked="predialysis.humor_excessive_symptom ? ['无','下肢水肿','颜面浮肿'].indexOf(getHumorExcessiveSymptom(predialysis.humor_excessive_symptom)) == -1 : false" showValue="其它"></label-box></td>
+                      <!-- <td width="50"><label-box :isChecked="predialysis.humor_excessive_symptom ? ['无','下肢水肿','颜面浮肿'].indexOf(getHumorExcessiveSymptom(predialysis.humor_excessive_symptom)) == -1 : false" showValue="其它"></label-box></td>
                       <td width="140">
                         <div class="under-line">
                           &nbsp;
@@ -199,7 +204,9 @@
                             {{ getHumorExcessiveSymptom(predialysis.humor_excessive_symptom) }}
                           </span>
                         </div>
-                      </td>
+                      </td> -->
+                      <td></td>
+                      <td></td>
                       <td></td>
                     </tr>
                   </tbody>

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2413,7 +2413,12 @@
         this.tabIndex = this.prescriptions.length
 
         var str = this.prescriptions[this.prescriptions.length - 1].name
-        this.tabIndex = parseInt(str.charAt(str.length - 1))
+
+        var reg =/[\u4e00-\u9fa5]/g;
+        // var str= " 阿达 adas 123132  一二三 ";
+        // str= str.replace(/[ ]/g, "");//去空格
+        str= str.replace(reg, "");//去除中文
+        this.tabIndex = parseInt(str.replace(reg, ""))
         ++this.tabIndex
         let newTabName = '处方' + this.tabIndex
         var nowDate = new Date()

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -451,9 +451,17 @@
             this.admin_info = response.data.data.info
 
             if (this.patientTableData.length > 0) {
-              this.$refs.tab.setCurrentRow(this.patientTableData[0])
-              this.oldCurrentRow = this.patientTableData[0]
-              this.getPatientInfo(this.patientTableData[0])
+              for(let i = 0; i < this.patientTableData.length; i++){
+                if(this.patientTableData[i].id == patient_id){
+                  this.$refs.tab.setCurrentRow(this.patientTableData[i])
+                  this.oldCurrentRow = this.patientTableData[i]
+                  this.getPatientInfo(this.patientTableData[i])
+
+
+                }
+
+              }
+
             }
           }
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -286,12 +286,12 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028">
-                                               <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span> 
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088">
+                                               <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
-                                              <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span> 
-                                             
+                                              <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span>
+
                                             </template>
                                         </el-table-column>
                                         <el-table-column label="单价" width="40">
@@ -383,7 +383,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088">
                                                    {{scope.row.stock_count}}
                                               </span>
                                               <span v-else> {{ scope.row.total }}</span>
@@ -2419,7 +2419,13 @@
         this.tabIndex = this.prescriptions.length
 
         var str = this.prescriptions[this.prescriptions.length - 1].name
-        this.tabIndex = parseInt(str.charAt(str.length - 1))
+
+        var reg =/[\u4e00-\u9fa5]/g;
+        // var str= " 阿达 adas 123132  一二三 ";
+        // str= str.replace(/[ ]/g, "");//去空格
+        // str= ;//去除中文
+        this.tabIndex = parseInt(str.replace(reg, ""))
+
         ++this.tabIndex
         let newTabName = '处方' + this.tabIndex
         var nowDate = new Date()
@@ -2652,7 +2658,7 @@
       selectDrugs(selection, row) {
         console.log('selection', selection)
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 ){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 ){
             if (row.count <= 0) {
               if (selection) {
                 selection.forEach(row => {
@@ -2681,7 +2687,7 @@
               return
             }
         }
-       
+
         this.curDrugs = selection
       },
 
@@ -2927,7 +2933,7 @@
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 ){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088){
            if (row.stock_count <= 0) {
             if (row.type == 3) {
               if (selection) {
@@ -2961,7 +2967,7 @@
           }
 
         }
-       
+
         this.teamList.push(row)
       },
       getlist() {
@@ -2994,8 +3000,8 @@
             }
 
             var good_info = response.data.data.good_info
-          
- 
+
+
             for (let i = 0; i < good_info.length; i++) {
                good_info[i].stock_count = 0
               if(good_info[i].good_stock_in.length >0 ){

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

@@ -3,8 +3,7 @@
     <div class="cell clearfix">
       <el-form :inline="true" :model="listQuery">
         <el-form-item label>
-          <!-- <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
-          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button> -->
+         
            <el-autocomplete
              class="checkSearch"
              popper-class="my-autocomplete"
@@ -70,6 +69,7 @@
       </div>
       <div style="padding-left:10px;flex:1">
         <div class="tableTitle">统计表</div>
+        <div><el-button type="primary" @click="exportList">导出</el-button></div>
         <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }" 
         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         >
@@ -100,7 +100,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="listQuery.page"
-          :page-sizes="[20, 40, 60, 80, 100]"
+          :page-sizes="[20, 40, 60, 80, 100,200,300,500,1000]"
           :page-size="10"
           background
           style="margin-top:20px;"
@@ -280,7 +280,7 @@ export default {
             }
           })
           let list = Object.values(dataInfo)
-          // console.log("arr",list)    
+             
           list.map(item => {
             for (let i = 0; i < prescriptionList.length; i++) {
               if (item.patient_id === prescriptionList[i].patient_id) {
@@ -462,7 +462,40 @@ export default {
         var strs = str.substring(0, str.length - 1)
        
         return strs
-      }
+      },
+      exportList(){
+        console.log("DialysisData",this.DialysisData)
+       for(let i=0;i<this.DialysisData.length;i++){
+         this.DialysisData[i].index = i+1
+         this.DialysisData[i].dialysis_mode = this.getModeIdCount(this.DialysisData[i].patient_id)
+         this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
+       }
+       import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','姓名', '年龄', '透析号','透析模式','透析总次数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','dialysis_mode','total_dialysis']
+        
+        const data = this.formatJson(filterVal, this.DialysisData)
+       
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '透析详情'
+         })
+          this.downloadLoading = false
+        })
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v =>
+          filterVal.map(j => {
+            if (j === "timestamp") {
+              return parseTime(v[j]);
+            } else {
+              return v[j];
+            }
+          })
+       );
+     }
+
   },
   created(){
     var nowDate = new Date();

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -45,7 +45,7 @@
           v-model="start_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -59,7 +59,7 @@
           v-model="end_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -293,6 +293,7 @@ export default {
           end_time:this.end_time,
           keyword:this.searchKey,
         }
+        console.log("博阿孙param232332232323",params)
         getDrugDamageList(params).then(response=>{
            if(response.data.state == 1){
              this.tableList = response.data.data.list
@@ -314,10 +315,12 @@ export default {
         return user_name
      },
      changeStartTime(){
-
+       this.start_time = this.getTime(this.start_time)
+       this.getlist()
      },
      changeEndTime(){
-
+       this.end_time = this.getTime(this.end_time)
+       this.getlist()
      },
      getTotalCount(drugid,max_unit,min_unit,min_number){
         
@@ -423,6 +426,8 @@ export default {
      getDrugDamageRadio(count){
 
        var total_count =  this.getDamagedCountOne(this.total_count)
+       console.log("count888888888888",count)
+       console.log("hh23232数据列表23322323",total_count)
        var all_count = 0
        all_count =  total_count * this.min_number
       

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -212,7 +212,7 @@
         </el-table-column>
         <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
-            {{getManufacturer(scope.row.drug.manufacturer)}}
+            {{getManufacturer(scope.row.manufacturer)}}
           </template>
         </el-table-column>
        <el-table-column label="生产日期" align="center">

src/xt_pages/stock/drugs/inventory.vue

@@ -64,8 +64,8 @@
               </el-table-column>
               <el-table-column prop="name" label="盘点前数量" width="180"  align="center">
                 <template slot-scope="scope">
-                    <span v-if="scope.row.stock_max_number > 0"><el-input style="width:50px" v-model="scope.row.stock_max_number" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
-                    <span v-if="scope.row.stock_min_number > 0"><el-input style="width:50px" v-model="scope.row.stock_min_number" :disabled="true"></el-input>{{scope.row.min_unit}}</span> 
+                    <span><el-input style="width:50px" v-model="scope.row.stock_max_number" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
+                    <span><el-input style="width:50px" v-model="scope.row.stock_min_number" :disabled="true"></el-input>{{scope.row.min_unit}}</span> 
                   </template> 
               </el-table-column>
 
@@ -230,7 +230,11 @@ export default {
             if (keyword != undefined) {
                 key = keyword
             }
-            postSearchDrugWarehouseList(key).then(response => {
+            console.log("keyword23323232323223",keyword)
+             var params = {
+                keyword:key,
+             }
+            postSearchDrugWarehouseList(params).then(response => {
             if (response.data.state == 1) {
             
                 var list = response.data.data.list
@@ -325,6 +329,7 @@ export default {
                       }
                    }
                  }
+                console.log("newlist23233223323222323232332",newList)
                 this.tableData = newList
                 this.showSearch = false
                 this.showTable = true

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -81,6 +81,7 @@
                 <template slot-scope="scope">
                   <span v-if="scope.row.stock_max_number>0">{{scope.row.stock_max_number}}{{scope.row.warehousing_unit}} </span>  
                   <span v-if="scope.row.stock_min_number>0">{{scope.row.stock_min_number}}{{scope.row.min_unit}}</span>
+                  <span v-if="scope.row.stock_max_number == 0 && scope.row.stock_min_number == 0">0</span>
                 </template> 
             </el-table-column>
 
@@ -88,6 +89,7 @@
                 <template slot-scope="scope">
                    <span v-if="scope.row.last_stock_max_number > 0">{{scope.row.last_stock_max_number}}{{scope.row.warehousing_unit}}</span>  
                    <span v-if="scope.row.last_stock_min_number>0">{{scope.row.last_stock_min_number}}{{scope.row.min_unit}}</span>
+                   <span v-if="scope.row.last_stock_max_number == 0 && scope.row.last_stock_min_number == 0">0</span>
                 </template> 
             </el-table-column>
             <el-table-column prop="name" label="盘点类型" width="120"  align="center">

src/xt_pages/stock/drugs/query.vue

@@ -112,7 +112,7 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center">
            <template slot-scope="scope">
-             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877">
+             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243 || org_id == 10088">
                 <span> 
                  {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
                 </span> 
@@ -123,8 +123,8 @@
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
-               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877">
-                {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
+               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243 || org_id == 10088">
+                {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
                </span>
                
                <span v-else>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>

src/xt_pages/stock/inventory.vue

@@ -26,7 +26,7 @@
           <div style="font-size:16px">{{item.good_name}}</div> &nbsp;&nbsp;{{item.specification_name}} <el-button type="warning" icon="el-icon-remove" style="margin-left:20px;" @click="toMove(item,index)">移除</el-button>
         </template>
         <el-table :data="item.child" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" style="width:100%">
-              <el-table-column prop="date" label="药品名称" width="150" align="center">
+              <el-table-column prop="date" label="耗材名称" width="150" align="center">
                 <template slot-scope="scope">
                   {{scope.row.good_name}}
                 </template>
@@ -64,7 +64,7 @@
               </el-table-column>
               <el-table-column prop="name" label="盘点前数量" width="100"  align="center">
                 <template slot-scope="scope">
-                    <span v-if="scope.row.stock_count > 0"><el-input style="width:80px" v-model="scope.row.stock_count" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
+                    <span><el-input style="width:80px" v-model="scope.row.stock_count" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
                   </template> 
               </el-table-column>
 
@@ -202,7 +202,10 @@ export default {
             if (keyword != undefined) {
                 key = keyword
             }
-            postSearchGoodWarehouseList(key).then(response => {
+            var params = {
+              keyword:key
+            }
+            postSearchGoodWarehouseList(params).then(response => {
             if (response.data.state == 1) {
             
                 var list = response.data.data.list
@@ -417,6 +420,7 @@ export default {
          if(response.data.state == 1){
            var list = response.data.data.list
            for(let i=0;i<list.length;i++){
+              list[i].type = 0
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name
               for(let j=0;j<this.manufacturerList.length;j++){

src/xt_pages/stock/inventoryDetails.vue

@@ -42,12 +42,12 @@
            
             <el-table-column prop="name" label="盘点前数量" width="100" align="center">
               <template slot-scope="scope">
-                 <span v-if="scope.row.stock_count >0 ">{{scope.row.stock_count}}</span>
+                 <span>{{scope.row.stock_count?scope.row.stock_count:0}}</span>
                 </template>
             </el-table-column>
             <el-table-column prop="name" label="盘点后数量" width="100" align="center">
               <template slot-scope="scope">
-                <span v-if="scope.row.last_stock_count>0">{{scope.row.last_stock_count}}</span> 
+                <span>{{scope.row.last_stock_count?scope.row.last_stock_count:0}}</span> 
              </template>
             </el-table-column>
            

src/xt_pages/stock/stockInOrder.vue

@@ -215,7 +215,7 @@
         </el-table-column>
         <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
-            {{ getManufactuerName(scope.row.GoodInfo.manufacturer)}}
+            {{ getManufactuerName(scope.row.manufacturer)}}
           </template>
         </el-table-column>
         <el-table-column label="生产日期" align="center">

src/xt_pages/stock/stockInventory.vue

@@ -40,7 +40,7 @@ export default {
             crumbs: [
                 { path: false, name: "库存管理" },
                 { path: false, name: "耗材管理" },
-                { path: false, name: "耗材报损" }
+                { path: false, name: "耗材盘点" }
             ],
             activeName:'first'
         }

src/xt_pages/stock/stockQuery.vue

@@ -108,7 +108,7 @@
        </el-table-column>
        <el-table-column label="出库数量" align="center">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877">
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088">
             <span>
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
             </span>
@@ -119,7 +119,7 @@
 
        <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span> 
          </template>
        </el-table-column>

src/xt_pages/user/dialysisSolution.vue

@@ -438,7 +438,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('灌流器') && (addPlan.mode_id == 2 || addPlan.mode_id == 12 || addPlan.mode_id == 5)">
+          <el-col :span="8" v-if="isShows('灌流器') && (addPlan.mode_id == 2 || addPlan.mode_id == 3 || addPlan.mode_id == 12 || addPlan.mode_id == 5)">
              <el-form-item label="灌流器:">
                <el-input v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
              </el-form-item>

src/xt_pages/user/doctorAdvice.vue

@@ -1491,31 +1491,27 @@
           <ul>
             <li>
               <span class="name">姓名：</span>
-              <!-- <input type="text" class="InputBox" v-model="currentPatient.name"> -->
               <span class="InputBox">&nbsp;{{ currentPatient.name }}</span>
             </li>
             <li>
               <span class="name">性别：</span>
-              <!-- <input type="text" class="InputBox"> -->
               <span class="InputBox"
                 >&nbsp;{{ tranSex(currentPatient.gender) }}</span
               >
             </li>
             <li>
               <span class="name">年龄：</span>
-              <!-- <input type="text" class="InputBox"> -->
               <span class="InputBox"
                 >&nbsp;{{ tranAge(currentPatient.birthday) }}岁</span
               >
             </li>
-            <li>
+            <li v-if="currentPatient.user_org_id!=10090">
               <span class="name">科别：</span>
-              <!-- <input type="text" class="InputBox"> -->
+             
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
             </li>
             <li>
               <span class="name">透析号：</span>
-              <!-- <input type="text" class="InputBox"> -->
               <span class="InputBox"
                 >&nbsp;&nbsp;&nbsp;{{
                   currentPatient.dialysis_no
@@ -1570,7 +1566,6 @@
                 <span v-if="advice.advice_desc"
                   >{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</span
                 >
-                <!-- <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span> -->
                 <span v-if="advice.prescribing_number"
                   >*{{ advice.prescribing_number
                   }}{{ advice.prescribing_number_unit }}</span
@@ -1585,9 +1580,7 @@
 
               <td>
                 <div>
-                  <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{
-                    getXuserName(advice.advice_doctor)
-                  }}</span>
+                  <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{getXuserName(advice.advice_doctor)}}</span>
                   <img
                     class="es-img"
                     :src="setAdminUserES(advice.advice_doctor)"
@@ -1600,26 +1593,13 @@
 
               <td></td>
               <td>
-                <span
-                  v-if="
-                    advice.stop_state == 1 && isShowCQStartTime(index, advice)
-                  "
-                  >{{ advice.stop_time | parseTime("{y}-{m}-{d}") }}</span
-                >
+                <span v-if="advice.stop_state == 1">{{ advice.stop_time | parseTime("{y}-{m}-{d}") }}</span>
               </td>
               <td>
-                <span
-                  v-if="
-                    advice.stop_state == 1 && isShowCQStartTime(index, advice)
-                  "
-                  >{{ advice.stop_time | parseTime("{h}:{i}") }}</span
-                >
+                <span v-if="advice.stop_state == 1">{{ advice.stop_time | parseTime("{h}:{i}") }}</span>
               </td>
               <td>
-                <div v-if="isShowCQStartTime(index, advice)">
-                  <span v-if="setAdminUserES(advice.stop_doctor) == ''">{{
-                    getXuserName(advice.stop_doctor)
-                  }}</span>
+                <div><span v-if="setAdminUserES(advice.stop_doctor) == ''">{{getXuserName(advice.stop_doctor)}}</span>
                   <img
                     class="es-img"
                     :src="setAdminUserES(advice.stop_doctor)"
@@ -1643,41 +1623,37 @@
           <ul>
             <li>
               <span class="name" style="width:50px;">姓名：</span>
-              <!-- <input type="text" class="InputBox" v-model="currentPatient.name"> -->
               <span class="InputBox">&nbsp;{{ currentPatient.name }}</span>
             </li>
             <li>
               <span class="name" style="width:50px;">性别：</span>
-              <!-- <input type="text" class="InputBox"> -->
               <span class="InputBox"
                 >&nbsp;{{ tranSex(currentPatient.gender) }}</span
               >
             </li>
             <li>
               <span class="name" style="width:50px;">年龄：</span>
-              <!-- <input type="text" class="InputBox"> -->
               <span class="InputBox"
                 >&nbsp;{{ tranAge(currentPatient.birthday) }}岁</span
               >
             </li>
-            <li>
+            <li v-if="currentPatient.user_org_id!=10090">
               <span class="name" style="width:30px;">科：</span>
-              <!-- <input type="text" class="InputBox"> -->
+             
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
             </li>
-            <li>
+            <li v-if="currentPatient.user_org_id!=10090">
               <span class="name" style="width:30px;">区：</span>
-              <!-- <input type="text" class="InputBox"> -->
+             
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
             </li>
-            <li>
+            <li v-if="currentPatient.user_org_id!=10090">
               <span class="name" style="width:30px;">房：</span>
-              <!-- <input type="text" class="InputBox"> -->
+              
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
             </li>
-            <li>
+            <li v-if="currentPatient.user_org_id!=10090">
               <span class="name" style="width:30px;">床：</span>
-              <!-- <input type="text" class="InputBox"> -->
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
             </li>
             <li>
@@ -1685,8 +1661,6 @@
               <span class="InputBox"
                 >&nbsp;{{ currentPatient.dialysis_no }}&nbsp;&nbsp;&nbsp;</span
               >
-
-              <!-- <input type="text" class="InputBox"> -->
             </li>
           </ul>
         </div>
@@ -1848,14 +1822,14 @@
               </td>
 
               <td>
-                <span v-if="advice.stop_state == 1 && advice.parent_id == 0">{{
+                <span v-if="advice.parent_id == 0">{{
                   advice.stop_time | parseTime("{y}-{m}-{d} {h}:{i}")
                 }}</span>
                 <span v-else></span>
               </td>
 
               <td>
-                <span v-if="advice.stop_state == 1 && advice.parent_id == 0">{{
+                <span v-if="advice.parent_id == 0">{{
                   getXuserName(advice.stop_doctor)
                 }}</span>
                 <span v-else></span>
@@ -2194,6 +2168,7 @@ export default {
       // console.log("column", column);
     },
     onTranPatient: function(tranPatient) {
+      console.log("患者信息",tranPatient)
       this.currentPatient = tranPatient;
     },
     adviceNameShow({ row, column, rowIndex, columnIndex }) {
@@ -3389,7 +3364,7 @@ export default {
       getDoctorAdviceList(this.listQuery).then(response => {
         if (response.data.state == 1) {
           this.adviceTableData = response.data.data.advices;
-          //console.log("数据是什么", this.adviceTableData);
+          console.log("数据是什么", this.adviceTableData);
           var advice = response.data.data.advices;
           var one = response.data.data.advicetwo;
           let dataInfo = {};
@@ -4710,8 +4685,6 @@ export default {
     this.unitsOption = getDataConfig("hemodialysis", "units");
     //查询该病人是否有排班记录
     this.getPatientSchedules(id);
-
-
     this.getSelfMedicalList(id)
   }
 };