1

src/api/advice.js

@@ -477,3 +477,14 @@ export function SaveEditAdvices(params) {
     params: params
   });
 }
+
+
+
+
+export function GetLastOrNextDoctorAdvice(params) {
+  return request({
+    url: "/api/doctoradvice/get",
+    method: "get",
+    params: params
+  });
+}

src/api/dialysis.js

@@ -218,6 +218,8 @@ export function postTreatmentsummary(params) {
 }
 
 export function postAssessmentAfterDislysis(params, data) {
+  console.log('到了没有', data)
+  console.log('params', params)
   return request({
     url: '/api/dialysis/assessmentafterdislysis',
     method: 'Post',

src/api/doctorSchedule.js

@@ -164,3 +164,11 @@ export function changeOption(params) {
     params: params
   })
 }
+
+export function getchartlist(params) {
+  return request({
+    url: '/api/schedule/getchartlist',
+    methods: 'get',
+    params: params
+  })
+}

src/api/patient.js

@@ -317,7 +317,6 @@ export function getAllDoctor(params) {
 }
 
 export function UpdateDryWeightData(params) {
-  console.log('我是傻子', params)
   return request({
     url: '/api/patient/updatedryweightdata',
     method: 'Post',
@@ -330,9 +329,6 @@ export function UpdateDryWeightData(params) {
 }
 
 export function getAllData(id, page, limit) {
-  console.log('id是什么', id)
-  console.log('page是什么', page)
-  console.log('limit是什么', limit)
   const params = {
     id: id,
     page: page,
@@ -360,3 +356,27 @@ export function getMaxDialysisNo() {
   })
 }
 
+export function getDryWeightDetail(id, params) {
+  return request({
+    url: '/api/paients/getdryweightdetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function modifyDryWeightData(params) {
+  return request({
+    url: '/api/patients/modifydryweightdata',
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteDryWeight(id, data) {
+  console.log('id', id)
+  return request({
+    url: '/api/patient/deletedryweight?id=' + id,
+    method: 'delete',
+    data: data
+  })
+}

src/api/role/admin.js

@@ -1,102 +1,103 @@
 import request from '@/utils/request'
+import { sort } from 'semver'
 
 export function adminMainView() {
-    return request({
-        url: '/api/adminmain',
-        method: 'get',
-    })
+  return request({
+    url: '/api/adminmain',
+    method: 'get'
+  })
 }
 
 export function getAdmins(page) {
-    const params = {
-        page: page,
-    }
-    return request({
-        url: '/api/admins',
-        method: 'get',
-        params: params,
-    })
+  const params = {
+    page: page
+  }
+  return request({
+    url: '/api/admins',
+    method: 'get',
+    params: params
+  })
 }
 
 export function getAddAdminInitData() {
-    return request({
-        url: '/api/admin/addinit',
-        method: 'get',
-    })
+  return request({
+    url: '/api/admin/addinit',
+    method: 'get'
+  })
 }
 
-export function addAdmin(mobile, name, type, title, role, intro,user_title_name) {
-    const params = {
-        mobile: mobile,
-        name: name,
-        type: type,
-        title: title,
-        role: role,
-        intro: intro,
-        user_title_name: user_title_name
-    }
-    return request({
-        url: '/api/admin/add',
-        method: 'post',
-        params: params,
-    })
+export function addAdmin(mobile, name, type, title, role, intro, user_title_name) {
+  const params = {
+    mobile: mobile,
+    name: name,
+    type: type,
+    title: title,
+    role: role,
+    intro: intro,
+    user_title_name: user_title_name
+  }
+  return request({
+    url: '/api/admin/add',
+    method: 'post',
+    params: params
+  })
 }
 
 export function getModifyAdminInitData(uid) {
-    const params = {
-        uid: uid,
-    }
-    return request({
-        url: '/api/admin/editinit',
-        method: 'get',
-        params: params,
-    })
+  const params = {
+    uid: uid
+  }
+  return request({
+    url: '/api/admin/editinit',
+    method: 'get',
+    params: params
+  })
 }
 
-export function modifyAdmin(uid, name, type, title, role, intro,user_title_name) {
-    const params = {
-        uid: uid,
-        name: name,
-        type: type,
-        title: title,
-        role: role,
-        intro: intro,
-      user_title_name: user_title_name
-
-    }
-    return request({
-        url: '/api/admin/edit',
-        method: 'post',
-        params: params,
-    })
+export function modifyAdmin(uid, name, type, title, role, intro, user_title_name, sort) {
+  const params = {
+    uid: uid,
+    name: name,
+    type: type,
+    title: title,
+    role: role,
+    intro: intro,
+    user_title_name: user_title_name,
+    sort: sort
+  }
+  return request({
+    url: '/api/admin/edit',
+    method: 'post',
+    params: params
+  })
 }
 
 export function setAdminStatus(uid, enable) {
-    const params = {
-        uid: uid,
-        enable: enable,
-    }
-    return request({
-        url: '/api/admin/setstatus',
-        method: 'post',
-        params: params,
-    })
+  const params = {
+    uid: uid,
+    enable: enable
+  }
+  return request({
+    url: '/api/admin/setstatus',
+    method: 'post',
+    params: params
+  })
 }
 
 export function getSpecialPermissionInitData() {
-    return request({
-        url: '/api/admin/specialpermission/initdata',
-        method: 'get',
-    })
+  return request({
+    url: '/api/admin/specialpermission/initdata',
+    method: 'get'
+  })
 }
 
 export function submitDialysisRecordPermissionUsers(ids_str) {
-    const params = {
-        ids: ids_str,
-    }
-    return request({
-        url: '/api/admin/specialpermission/dialysisrecord/submit',
-        method: 'post',
-        params: params,
-    })
+  const params = {
+    ids: ids_str
+  }
+  return request({
+    url: '/api/admin/specialpermission/dialysisrecord/submit',
+    method: 'post',
+    params: params
+  })
 }

src/router/index.js

@@ -22,12 +22,6 @@ import slow from './modules/slow'
 import scrm from './modules/scrm'
 import shop from './modules/shop'
 
-
-
-
-
-
-
 Vue.use(Router)
 
 /** note: submenu only apppear when children.length>=1
@@ -60,32 +54,32 @@ var _constant_router_map = [{
   component: () => import('@/xt_pages/index/verify_token'),
   hidden: true
 },
-  {
-    path: '/404',
-    component: () => import('@/views/errorPage/404'),
-    hidden: true
-  },
-  {
-    path: '/401',
-    component: () => import('@/views/errorPage/401'),
-    hidden: true
-  },
-  {
-    path: '',
-    component: Layout,
-    redirect: '/home',
-    children: [{
-      path: '/home',
-      component: () => import('@/xt_pages/home/index'),
-      name: 'home',
-      meta: {
-        title: 'home',
-        icon: 'dashboard',
-        noCache: true
-      }
-    }]
-  },
-  service,
+{
+  path: '/404',
+  component: () => import('@/views/errorPage/404'),
+  hidden: true
+},
+{
+  path: '/401',
+  component: () => import('@/views/errorPage/401'),
+  hidden: true
+},
+{
+  path: '',
+  component: Layout,
+  redirect: '/home',
+  children: [{
+    path: '/home',
+    component: () => import('@/xt_pages/home/index'),
+    name: 'home',
+    meta: {
+      title: 'home',
+      icon: 'dashboard',
+      noCache: true
+    }
+  }]
+},
+service
   // patient,
   // workforce,
   // weight_sign,
@@ -113,7 +107,7 @@ var _asy_router_map = [
   scrm,
   shop,
   integration,
-  systems,
+  systems
 ]
 
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

src/xt_pages/dialysis/batch_print/batch_print_order_eight.vue

@@ -598,7 +598,8 @@
                 <tr>
                   <td colspan="8" style="text-align:left;">
                     <span style="display:inline-block;margin-left:15px;">中心静脉导管:
-                     (部位：{{ getPartName(record.assessment_before_dislysis.blood_access_part_id) }})
+                     <!-- (部位：{{ getPartName(record.assessment_before_dislysis.blood_access_part_id) }}) -->
+                     (部位：{{ record.assessment_before_dislysis.blood_access_part_id }})
                         <label-box
                           showValue="长期"
                           :isChecked="

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -265,14 +265,12 @@
                           style="width: 200px;text-align: center;"
                         >
                           {{
-                            QueryPartById(
                               record.assessment_before_dislysis &&
                                 record.assessment_before_dislysis
                                   .blood_access_part_id
                                 ? record.assessment_before_dislysis
                                     .blood_access_part_id
-                                : 0
-                            )
+                                : 0  
                           }}
                           {{
                             record.assessment_before_dislysis &&

src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue

@@ -99,13 +99,22 @@
                     （<label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '中心静脉置管-左')" showValue="左"></label-box>
                         <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '中心静脉置管-右')" showValue="右"></label-box>）部位
                     &nbsp;
-                    <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id ? (record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','颈内')) : false" showValue="颈内"></label-box>
+                    <!-- <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id ? (record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','颈内')) : false" showValue="颈内"></label-box>
                     &nbsp;
                     <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id ? (record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','锁骨下')) : false" showValue="锁骨下"></label-box>
                     &nbsp;
                     <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id ? (record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','股')) : false" showValue="股"></label-box>
                     &nbsp;
                     <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id ? (record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','其他')) : false" showValue="其他"></label-box>
+                    &nbsp; -->
+
+                    <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id.indexOf('颈内')>-1?true:false"  showValue="颈内"></label-box>
+                    &nbsp;
+                    <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id.indexOf('锁骨下')>-1?true:false" showValue="锁骨下"></label-box>
+                    &nbsp;
+                    <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id.indexOf('股')>-1?true:false"  showValue="股"></label-box>
+                    &nbsp;
+                    <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id.indexOf('其他')>-1?true:false"  showValue="其他"></label-box>
                     &nbsp;
                     </div>
                 </div>

src/xt_pages/dialysis/batch_print/batch_print_order_twenty.vue

@@ -293,7 +293,7 @@
                                 <td width="40">位置:</td>
                                 <td width="350">
                                 <div>
-                                    <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id ? (QueryPartById(record.assessment_before_dislysis.blood_access_part_id).indexOf('左') > -1 ? true : false) : false" showValue="左"></label-box>
+                                    <!-- <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id ? (QueryPartById(record.assessment_before_dislysis.blood_access_part_id).indexOf('左') > -1 ? true : false) : false" showValue="左"></label-box>
                                     &nbsp;
                                     <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id ? (QueryPartById(record.assessment_before_dislysis.blood_access_part_id).indexOf('右') > -1 ? true : false) : false" showValue="右"></label-box>
                                     &nbsp;
@@ -301,8 +301,18 @@
                                     &nbsp;
                                     <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id ? (QueryPartById(record.assessment_before_dislysis.blood_access_part_id).indexOf('股静脉') > -1 ? true : false) : false" showValue="股静脉"></label-box>
                                     &nbsp;
-                                    <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id ? (QueryPartById(record.assessment_before_dislysis.blood_access_part_id).indexOf('锁骨下') > -1 ? true : false) : false" showValue="锁骨下"></label-box>
+                                    <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id ? (QueryPartById(record.assessment_before_dislysis.blood_access_part_id).indexOf('锁骨下') > -1 ? true : false) : false" showValue="锁骨下"></label-box> -->
+                                    <!-- &nbsp; -->
+
+                                    <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id.indexOf('左')>-1?true:false" showValue="左"></label-box>
+                                    &nbsp;
+                                    <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id.indexOf('右')>-1?true:false" showValue="右"></label-box>
+                                    &nbsp;
+                                    <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id.indexOf('颈内静脉')>-1?true:false" showValue="颈内静脉"></label-box>
                                     &nbsp;
+                                    <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id.indexOf('股静脉')>-1?true:false" showValue="股静脉"></label-box>
+                                    &nbsp;
+                                    <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id.indexOf('锁骨下')>-1?true:false" showValue="锁骨下"></label-box>
                                 </div>
                                 </td>
 
@@ -854,10 +864,15 @@
                             <tr>
                                 <td width="90">封管液配制:</td>
                                 <td width="420">
-                                <label-box :isChecked="record.assessment_after_dislysis.sealing_fluid_dispose ? getSealingFluidDispose(record.assessment_after_dislysis.sealing_fluid_dispose).indexOf('常规（肝素盐水）') > -1 : false" showValue="常规（肝素盐水）"></label-box>&nbsp;
+                                <!-- <label-box :isChecked="record.assessment_after_dislysis.sealing_fluid_dispose ? getSealingFluidDispose(record.assessment_after_dislysis.sealing_fluid_dispose).indexOf('常规（肝素盐水）') > -1 : false" showValue="常规（肝素盐水）"></label-box>&nbsp;
                                 <label-box :isChecked="record.assessment_after_dislysis.sealing_fluid_dispose ? getSealingFluidDispose(record.assessment_after_dislysis.sealing_fluid_dispose).indexOf('常规（肝素盐水）1:1') > -1 : false" showValue="1:1"></label-box>&nbsp;
                                 <label-box :isChecked="record.assessment_after_dislysis.sealing_fluid_dispose ? getSealingFluidDispose(record.assessment_after_dislysis.sealing_fluid_dispose).indexOf('常规（肝素盐水）1:3') > -1 : false" showValue="1:3"></label-box>&nbsp;
-                                <label-box :isChecked="record.assessment_after_dislysis.sealing_fluid_dispose ? getSealingFluidDispose(record.assessment_after_dislysis.sealing_fluid_dispose).indexOf('特殊（肝素尿激酶盐水）') > -1 : false" showValue="特殊（肝素尿激酶盐水）"></label-box>&nbsp;
+                                <label-box :isChecked="record.assessment_after_dislysis.sealing_fluid_dispose ? getSealingFluidDispose(record.assessment_after_dislysis.sealing_fluid_dispose).indexOf('特殊（肝素尿激酶盐水）') > -1 : false" showValue="特殊（肝素尿激酶盐水）"></label-box>&nbsp; -->
+
+                                <label-box :isChecked="record.assessment_after_dislysis.sealing_fluid_dispose.indexOf('常规（肝素盐水）')>-1?true:false" showValue="常规（肝素盐水）"></label-box>&nbsp;
+                                <label-box :isChecked="record.assessment_after_dislysis.sealing_fluid_dispose.indexOf('常规（肝素盐水）1:1')>-1?true:false" showValue="1:1"></label-box>&nbsp;
+                                <label-box :isChecked="record.assessment_after_dislysis.sealing_fluid_dispose.indexOf('常规（肝素盐水）1:3')>-1?true:false" showValue="1:3"></label-box>&nbsp;
+                                <label-box :isChecked="record.assessment_after_dislysis.sealing_fluid_dispose.indexOf('特殊（肝素尿激酶盐水')>-1?true:false" showValue="特殊（肝素尿激酶盐水）"></label-box>&nbsp;
                                 </td>
                                 <td width='40'>其他</td>
                                 <td width='160'>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -109,10 +109,11 @@
 
         <li v-if="isShow('封管液配置')">
           <label>封管液配置: </label>
-          <span class="content">{{ getSealingFluidDisposeName(this.record.sealing_fluid_dispose) }}</span>
+          <!-- <span class="content">{{ getSealingFluidDisposeName(this.record.sealing_fluid_dispose) }}</span> -->
+           <span class="content">{{this.record.sealing_fluid_dispose}}</span>
         </li>
 
-        <li v-if="isShow('封管液特殊') && getSealingFluidDisposeName(this.record.sealing_fluid_dispose) == '特殊'">
+        <li v-if="isShow('封管液特殊') && this.record.sealing_fluid_dispose.indexOf('特殊')>-1">
           <label>封管液配置(特殊): </label>
           <span class="content">{{ sealing_fluid_special }}</span>
         </li>

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -176,9 +176,8 @@
 
         <li v-if="isShow('血管通路部位')">
           <label>血管通路部位:</label>
-          <span class="content">{{
-            getBloodAccessPart(this.record.blood_access_part_id)
-          }}</span>
+          <!-- <span class="content">{{getBloodAccessPart(this.record.blood_access_part_id)}}</span> -->
+          <span class="content">{{this.record.blood_access_part_id}}</span>
           <span class="unit"> </span>
         </li>
       </ul>

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

@@ -406,10 +406,15 @@
 
         <el-col :span="8" v-if="isShow('封管液配置')">
           <el-form-item label="封管液配置：">
-            <el-select v-model="form.sealing_fluid_dispose">
+            <!-- <el-select v-model="form.sealing_fluid_dispose">
               <el-option :key="0" label="请选择" :value="0"></el-option>
               <el-option v-for="item in this.sealingFluidDisposeOptions" :label="item.name" :value="item.id" :key="item.id"></el-option>
-            </el-select>
+            </el-select> -->
+             <el-input
+                v-model="form.sealing_fluid_dispose"
+                readonly
+                @focus="showDialog('9')"
+              ></el-input>
           </el-form-item>
         </el-col>
 
@@ -742,12 +747,21 @@ export default {
   },
   watch: {
     'form.sealing_fluid_dispose': function() {
-      var tempsealingFluidDisposeOptions = getDataConfig('hemodialysis', 'sealing_fluid_dispose')
-      for (let i = 0; i < tempsealingFluidDisposeOptions.length; i++) {
-        if (tempsealingFluidDisposeOptions[i].id == this.form.sealing_fluid_dispose) {
-          this.sealing_fluid_special_name = tempsealingFluidDisposeOptions[i].name
+      // var tempsealingFluidDisposeOptions = getDataConfig('hemodialysis', 'sealing_fluid_dispose')
+      // for (let i = 0; i < tempsealingFluidDisposeOptions.length; i++) {
+      //   if (tempsealingFluidDisposeOptions[i].id == this.form.sealing_fluid_dispose) {
+      //     this.sealing_fluid_special_name = tempsealingFluidDisposeOptions[i].name
+      //   }
+      // }
+      var name =""
+      var str = this.form.sealing_fluid_dispose
+      var arr = str.split(',')
+      for(let i=0;i<arr.length;i++){
+        if(arr[i]== "特殊"){
+           name = "特殊"
         }
       }
+      this.sealing_fluid_special_name = name
       return this.sealing_fluid_special_name
     },
     'assessment_after_dislysis.id': function() {
@@ -921,7 +935,8 @@ export default {
       data['dialysis_during'] = this.form.dialysis_during ? parseFloat(this.form.dialysis_during) : 0
       data['stroke_volume'] = this.form.stroke_volume ? parseFloat(this.form.stroke_volume) : 0
       data['blood_flow'] = this.form.blood_flow ? parseFloat(this.form.blood_flow) : 0
-      data['sealing_fluid_dispose'] = this.form.sealing_fluid_dispose ? parseFloat(this.form.sealing_fluid_dispose) : 0
+      // data['sealing_fluid_dispose'] = this.form.sealing_fluid_dispose ? parseFloat(this.form.sealing_fluid_dispose) : 0
+      data['sealing_fluid_dispose'] = this.form.sealing_fluid_dispose
       data['sealing_fluid_special'] = this.form.sealing_fluid_special
       data['dosage_of_anticoagulants'] = this.form.dosage_of_anticoagulants ? parseFloat(this.form.dosage_of_anticoagulants) : 0
       data['supine_systolic_blood_pressure'] = this.form.supine_systolic_blood_pressure
@@ -929,7 +944,6 @@ export default {
       data["supine_diastolic_blood_pressure"] = this.form.supine_diastolic_blood_pressure
       data["diastolic_pressure"] = this.form.diastolic_pressure
       data["additional_weight"] = this.form.additional_weight ? parseFloat(this.form.additional_weight) : 0
-      console.log('data', data)
       postAssessmentAfterDislysis(ParamsQuery, data)
         .then(response => {
           this.loading = false
@@ -1019,6 +1033,13 @@ export default {
           this.InnerDialogProps.selected = this.form.disequilibrium_syndrome_option
           this.InnerDialogProps.isShowTextArea = false
           break
+       case '9':
+          this.InnerDialogProps.values = this.sealingFluidDisposeOptions
+          this.InnerDialogProps.titles = '封管液配置'
+          this.InnerDialogProps.type = 'sealing_fluid_dispose'
+          this.InnerDialogProps.selected = this.form.sealing_fluid_dispose
+          this.InnerDialogProps.isShowTextArea = false
+          break
       }
     },
     selectActualTreatmentHour(val) {
@@ -1053,7 +1074,9 @@ export default {
         case 'disequilibrium_syndrome_option':
           this.form.disequilibrium_syndrome_option = val.value.join(',')
           break
-
+        case 'sealing_fluid_dispose':
+          this.form.sealing_fluid_dispose = val.value.join(',')
+          break
         default:
           break
       }

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -386,7 +386,7 @@
               <el-input v-model="nameForm.advice_name"></el-input>
             </el-form-item>
           </el-col>
-          
+
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -487,7 +487,7 @@
           </el-col>
         </el-row>
         <el-row>
-          
+
           <el-col :span="12">
             <el-form-item label="执行频率 :" prop="execution_frequency">
               <el-select
@@ -1295,6 +1295,8 @@ export default {
               }
               this.$set(item, "children", item.children);
             }
+            console.log("11122333")
+            console.log(item)
             this.allSelectedTemplate.unshift(item);
             adviceTemplate.DoctorAdviceTemplate[index].selection = false;
           }
@@ -1367,7 +1369,7 @@ export default {
             this.$set(item, "children", item.children);
           }
         }
-
+        console.log(this.groupForm.adviceNames)
         this.groupForm.adviceNames.push(item);
       }
       this.templateFormVisible = false;

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

@@ -121,12 +121,13 @@
 
           <el-col :span="8">
             <el-form-item label="血管通路部位： " v-if="isShow('血管通路部位')">
-              <el-select v-model="assessmentBeforeDislysis.blood_access_part_id">
+              <!-- <el-select v-model="assessmentBeforeDislysis.blood_access_part_id">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
                 <el-option v-for="item in blood_access_part" :label="item.name" :value="item.id"
                            :key="item.id"></el-option>
-              </el-select>
+              </el-select> -->
+              <el-input v-model="assessmentBeforeDislysis.blood_access_part_id" readonly @focus="showInnerDialog('17')"></el-input>
             </el-form-item>
           </el-col>
 
@@ -962,7 +963,14 @@
             this.InnerDialogProps.isShowTextArea = false
 
             break
+          case '17': // 水肿
+            this.InnerDialogProps.values = this.blood_access_part
+            this.InnerDialogProps.titles = '血管通路部位'
+            this.InnerDialogProps.type = 'blood_access_part_id'
+            this.InnerDialogProps.selected = this.assessmentBeforeDislysis.blood_access_part_id
+            this.InnerDialogProps.isShowTextArea = false
 
+            break
         }
       },
       innerDialogComfirm: function(val) {
@@ -1020,6 +1028,9 @@
           case 'edema':
             this.assessmentBeforeDislysis.edema = val.value.join(',')
             break
+          case 'blood_access_part_id':
+            this.assessmentBeforeDislysis.blood_access_part_id = val.value.join(',')
+           break
         }
       },
       innerDialogCancle: function() {
@@ -1053,8 +1064,10 @@
             }
           }
         }
-
+         console.log("params",ParamsQuery)
+         
         postAssessmentBeforeDislysis(ParamsQuery).then(response => {
+          
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false

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

@@ -779,15 +779,15 @@
     >
       <div style="font-size:0.6rem;padding-left:0.38rem;margin-top:0.2rem;">
         <span style="font-weight: bold;color: #409eff;">开始时间:</span>
-        <el-time-picker
-          format="HH:mm"
-          value-format="HH:mm"
+        <el-date-picker
+          type="datetime"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
+          placeholder="选择时间"
           v-model="start_time"
-          @change="changeTime"
-          :picker-options="{
-      selectableRange: '00:00:00 - 23:59:00'
-    }">
-        </el-time-picker>
+          style="width:100%;"
+        ></el-date-picker>
+
         <!--<span style="display: inline-block;border: 1px solid #ccc;padding: 10px 20px;border-radius: 5px;" @click="changeStartTime">{{ advice_start_time }}</span>-->
       </div>
       <el-checkbox-group v-model="checkedCities">
@@ -1541,23 +1541,15 @@
                 })
                 var date = new Date()
 
-                var hour =
-                  date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
-                var minute =
-                  date.getMinutes() < 10
-                    ? '0' + date.getMinutes()
-                    : date.getMinutes()
+                console.log(this.start_time)
 
                 const params = {
                   advices: results,
-                  advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                  advice_date: this.start_time.split(" ")[0],
                   advice_doctor: results[0].advice_doctor,
                   advice_type: results[0].advice_type,
                   parent_id: this.patient_id,
-                  start_time:
-                    uParseTime(this.$route.query.date, '{y}-{m}-{d}') +
-                    ' ' +
-                   this.advice_start_time,
+                  start_time:this.start_time,
                   remark: ''
                 }
                 CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(
@@ -1619,15 +1611,12 @@
 
                 const params = {
                   advices: results,
-                  advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                  advice_date: this.start_time.split(" ")[0],
                   advice_doctor: results[0].advice_doctor,
                   advice_type: results[0].advice_type,
                   parent_id: this.patient_id,
-                  start_time:
-                    uParseTime(this.$route.query.date, '{y}-{m}-{d}') +
-                    ' ' +
-                    this.advice_start_time,
-                  remark: ''
+                  start_time:this.start_time,
+                  remark: '',
                 }
                 CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(
                   rs => {
@@ -1760,17 +1749,33 @@
       },
       show(pre,schedual,last) {
 
+        var date = new Date()
+        var year = date.getFullYear()
+        var month = date.getMonth() + 1
+        var day = date.getDate()
+
+        var hours = date.getHours()
+        var minites = date.getMinutes()
+
+        if (month < 10) {
+          month = '0' + month
+        }
+        if (day < 10) {
+          day = '0' + day
+        }
+        if (hours < 10) {
+          hours = '0' + hours
+        }
+        if (minites < 10) {
+          minites = '0' + minites
+        }
+
         if(schedual.schedule_type == 1){
-          this.start_time = new Date(2016, 9, 10, 7, 0,0)
-          this.advice_start_time = "07:00"
+          this.start_time = year +"-"+month +"-"+day +" " + "07:00"
         }else if(schedual.schedule_type == 2){
-          this.start_time = new Date(2016, 9, 10, 12, 0,0)
-          this.advice_start_time = "12:00"
-
+          this.start_time = year +"-"+month +"-"+day +" " + "12:00"
         }else if(schedual.schedule_type ==3){
-          this.start_time = new Date(2016, 9, 10, 18, 0,0)
-          this.advice_start_time = "18:00"
-
+          this.start_time = year +"-"+month +"-"+day +" " + "18:00"
         }
 
         if (pre.anticoagulant == 3) {

src/xt_pages/dialysis/details/index.vue

@@ -870,7 +870,7 @@ export default {
     getScheduleDetail: function() {
       this.loading = true
       var dateStr = parseTime(this.date, '{y}-{m}-{d}')
-     
+
       this.doctor_advices = []
       getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
         var resp = rs.data
@@ -888,7 +888,7 @@ export default {
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
           console.log('receiver_treatment_access', receiver_treatment_access)
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
-          console.log('透前评估', predialysis_evaluation)
+          console.log('透前评估22222', predialysis_evaluation)
 
           if (predialysis_evaluation != null) {
             if (predialysis_evaluation.blood_access_part_id == -2) {
@@ -896,10 +896,10 @@ export default {
             }
           }
           var doctor_advices = resp.data.doctor_advices // 临时医嘱
-       
+
           var double_check = resp.data.double_check // 双人核对
           var assessment_after_dislysis = resp.data.assessment_after_dislysis // 透后评估
-    
+
           var treatment_summary = resp.data.treatment_summary // 治疗小结
           var monitor_records = resp.data.monitor_records // 透析监测
           var dialysis_order = resp.data.dialysis_order // 透析记录
@@ -930,7 +930,7 @@ export default {
             resp.data.lastAssessmentAfterDislysis
           var lastDialysisPrescribe = resp.data.lastDialysisPrescribe
           var lastDryWeightDislysis = resp.data.lastDryWeightDislysis
-
+          console.log("最后一次干体重",lastDryWeightDislysis)
           var system_prescribe = resp.data.system_prescribe
 
           this.$refs.nav.setLastRecord(
@@ -954,6 +954,29 @@ export default {
           this.headNurses = headNurses
           this.system_prescribe = system_prescribe
 
+
+
+
+          this.niprocart_info = []
+          this.jms_info = []
+          this.fistula_needle_set_info = []
+          this.fistula_needle_set_16_info = []
+          this.hemoperfusion_info = []
+          this.dialyser_sterilised_info = []
+
+          this.filtryzer_info = []
+          this.dialyzers_info = []
+          this.injector_info = []
+
+          this.bloodlines_info = []
+          this.tubingHemodialysis_info = []
+          this.safe_package_info = []
+          this.aliquid_info = []
+
+
+
+
+
           this.niprocart_info = niprocart_info
           this.jms_info = jms_info
           this.fistula_needle_set_info = fistula_needle_set_info

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -470,7 +470,8 @@
         <tr>
           <td colspan="8" style="text-align:left;">
             <span style="display:inline-block;margin-left:15px;">中心静脉导管:</span>
-            (部位：{{ getPartName(predialysis.blood_access_part_id) }})
+            <!-- (部位：{{ getPartName(predialysis.blood_access_part_id) }}) -->
+            (部位：{{predialysis.blood_access_part_id }})
             <label-box
               showValue="长期"
               :isChecked="

src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue

@@ -209,7 +209,8 @@
                   <div class="inline_block" style="flex:1.4">
                     血管通路：
                     <div class="under_line" style="width: 200px;text-align: center;">
-                      {{ QueryPartById(predialysis.blood_access_part_id) }}
+                      <!-- {{ QueryPartById(predialysis.blood_access_part_id) }} -->
+                      {{predialysis.blood_access_part_id}}
                       {{ predialysis.blood_access_part_opera_name }}
                     </div>
                   </div>

src/xt_pages/dialysis/template/DialysisPrintOrderFourteen.vue

@@ -346,16 +346,20 @@
                     <td width="100">血管通路位置:</td>
                     <td width="90">
                       <div>
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('左') > -1 ? true : false) : false" showValue="左"></label-box>
+                        <!-- <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('左') > -1 ? true : false) : false" showValue="左"></label-box>
                         &nbsp;
                         <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('右') > -1 ? true : false) : false" showValue="右"></label-box>
+                        &nbsp; -->
+                        <label-box :isChecked="predialysis.blood_access_part_id.indexOf('左')>-1?true:false" showValue="左"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id.indexOf('右')>-1?true:false" showValue="右"></label-box>
                         &nbsp;
                       </div>
                     </td>
                     <td width="10">（</td>
                     <td width="380">
                       <div>
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('颈内') > -1 ? true : false) : false" showValue="颈内"></label-box>
+                        <!-- <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('颈内') > -1 ? true : false) : false" showValue="颈内"></label-box>
                         &nbsp;
                         <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('股V') > -1 ? true : false) : false" showValue="股V"></label-box>
                         &nbsp;
@@ -366,6 +370,19 @@
                         <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('上臂') > -1 ? true : false) : false" showValue="上臂"></label-box>
                         &nbsp;
                         <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('下肢') > -1 ? true : false) : false" showValue="下肢"></label-box>
+                        &nbsp; -->
+
+                       <label-box :isChecked="predialysis.blood_access_part_id.indexOf('颈内')>-1?true:false" showValue="颈内"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id.indexOf('股V')>-1?true:false" showValue="股V"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id.indexOf('锁骨下')>-1?true:false" showValue="锁骨下"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id.indexOf('前臂')>-1?true:false" showValue="前臂"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id.indexOf('上臂')>-1?true:false" showValue="上臂"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id.indexOf('下肢')>-1?true:false" showValue="下肢"></label-box>
                         &nbsp;
                       </div>
                     </td>
@@ -788,12 +805,12 @@
                   <tr>
                       <td width="80">封管液配置:</td>
                       <td width="160">
-                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? afterdialysis.sealing_fluid_dispose == 1 : false" showValue="常规（肝素/NS）1:1"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('常规（肝素/NS）1:1')>-1?true:false" showValue="常规（肝素/NS）1:1"></label-box>&nbsp;
                       </td>
                       <td width="30"></td>
                       <td width="40">特殊:</td>
                       <td width="140">
-                        <div class="under-line">&nbsp;<span v-if="afterdialysis.sealing_fluid_dispose == 2">{{ afterdialysis.sealing_fluid_special ? afterdialysis.sealing_fluid_special : '' }}</span></div>
+                        <div class="under-line">&nbsp;<span v-if="afterdialysis.sealing_fluid_dispose.indexOf('特殊')>-1">{{ afterdialysis.sealing_fluid_special ? afterdialysis.sealing_fluid_special : '' }}</span></div>
                       </td>
                       <td width="30"></td>
                       <td width="50">封管量:</td>

src/xt_pages/dialysis/template/DialysisPrintOrderNineteen.vue

@@ -218,7 +218,8 @@
                   <div class="inline_block" style="flex:1.4">
                     血管通路：
                     <div class="under_line" style="width: 200px;text-align: center;">
-                      {{ QueryPartById(predialysis.blood_access_part_id) }}
+                      <!-- {{ QueryPartById(predialysis.blood_access_part_id) }} -->
+                      {{predialysis.blood_access_part_id}}
                       {{ predialysis.blood_access_part_opera_name }}
                     </div>
                   </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

@@ -488,7 +488,8 @@
         <tr>
           <td colspan="8" style="text-align:left;">
             <span style="display:inline-block;margin-left:15px;">中心静脉导管:</span>
-            (部位：{{ getPartName(predialysis.blood_access_part_id) }})
+            <!-- (部位：{{ getPartName(predialysis.blood_access_part_id) }}) -->
+             (部位：{{predialysis.blood_access_part_id}})
             <label-box
               showValue="长期"
               :isChecked="

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -218,7 +218,8 @@
                   <div class="inline_block" style="flex:1.4">
                     血管通路：
                     <div class="under_line" style="width: 200px;text-align: center;">
-                      {{ QueryPartById(predialysis.blood_access_part_id) }}
+                      <!-- {{ QueryPartById(predialysis.blood_access_part_id) }} -->
+                      {{predialysis.blood_access_part_id}}
                       {{ predialysis.blood_access_part_opera_name }}
                     </div>
                   </div>

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -209,7 +209,8 @@
                   <div class="inline_block" style="flex:1.4">
                     血管通路：
                     <div class="under_line" style="width: 200px;text-align: center;">
-                      {{ QueryPartById(predialysis.blood_access_part_id) }}
+                      <!-- {{ QueryPartById(predialysis.blood_access_part_id) }} -->
+                      {{predialysis.blood_access_part_id}}
                       {{ predialysis.blood_access_part_opera_name }}
                     </div>
                   </div>

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -143,13 +143,21 @@
           （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左') > -1 ? true : false" showValue="左"></label-box>
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右') > -1 ? true : false" showValue="右"></label-box>）部位
           &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_id > 0 ? (getPartName(predialysis.blood_access_part_id).indexOf('颈内') > -1 ? true : false) : false" showValue="颈内"></label-box>
+          <!-- <label-box :isChecked="predialysis.blood_access_part_id > 0 ? (getPartName(predialysis.blood_access_part_id).indexOf('颈内') > -1 ? true : false) : false" showValue="颈内"></label-box>
           &nbsp;
           <label-box :isChecked="predialysis.blood_access_part_id > 0 ? (getPartName(predialysis.blood_access_part_id).indexOf('锁骨下') > -1 ? true : false) : false" showValue="锁骨下"></label-box>
           &nbsp;
           <label-box :isChecked="predialysis.blood_access_part_id > 0 ? (getPartName(predialysis.blood_access_part_id).indexOf('股') > -1 ? true : false) : false" showValue="股"></label-box>
           &nbsp;
           <label-box :isChecked="predialysis.blood_access_part_id > 0 ? (getPartName(predialysis.blood_access_part_id).indexOf('其他') > -1? true : false) :false" showValue="其他"></label-box>
+          &nbsp; -->
+          <label-box :isChecked="predialysis.blood_access_part_id.indexOf('颈内')>-1?true:false" showValue="颈内"></label-box>
+          &nbsp;
+          <label-box :isChecked="predialysis.blood_access_part_id.indexOf('锁骨下')>-1?true:false" showValue="锁骨下"></label-box>
+          &nbsp;
+          <label-box :isChecked="predialysis.blood_access_part_id.indexOf('股')>-1?true:false" showValue="股"></label-box>
+          &nbsp;
+          <label-box :isChecked="predialysis.blood_access_part_id.indexOf('其他')>-1?true:false" showValue="其他"></label-box>
           &nbsp;
         </div>
       </div>

src/xt_pages/dialysis/template/DialysisPrintOrderTwenty.vue

@@ -283,7 +283,7 @@
                     <td width="40">位置:</td>
                     <td width="350">
                       <div>
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('左') > -1 ? true : false) : false" showValue="左"></label-box>
+                        <!-- <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('左') > -1 ? true : false) : false" showValue="左"></label-box>
                         &nbsp;
                         <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('右') > -1 ? true : false) : false" showValue="右"></label-box>
                         &nbsp;
@@ -292,6 +292,17 @@
                         <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('股静脉') > -1 ? true : false) : false" showValue="股静脉"></label-box>
                         &nbsp;
                         <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('锁骨下') > -1 ? true : false) : false" showValue="锁骨下"></label-box>
+                        &nbsp; -->
+
+                        <label-box :isChecked="predialysis.blood_access_part_id.indexOf('左')>-1?true:false" showValue="左"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id.indexOf('右')>-1?true:false" showValue="右"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id.indexOf('颈内静脉')>-1?true:false" showValue="颈内静脉"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id.indexOf('股静脉')>-1?true:false" showValue="股静脉"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id.indexOf('锁骨下')>-1?true:false" showValue="锁骨下"></label-box>
                         &nbsp;
                       </div>
                     </td>
@@ -808,10 +819,15 @@
                   <tr>
                     <td width="90">封管液配制:</td>
                     <td width="420">
-                      <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('常规（肝素盐水）') > -1 : false" showValue="常规（肝素盐水）"></label-box>&nbsp;
+                      <!-- <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('常规（肝素盐水）') > -1 : false" showValue="常规（肝素盐水）"></label-box>&nbsp;
                       <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('常规（肝素盐水）1:1') > -1 : false" showValue="1:1"></label-box>&nbsp;
                       <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('常规（肝素盐水）1:3') > -1 : false" showValue="1:3"></label-box>&nbsp;
-                      <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('特殊（肝素尿激酶盐水）') > -1 : false" showValue="特殊（肝素尿激酶盐水）"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('特殊（肝素尿激酶盐水）') > -1 : false" showValue="特殊（肝素尿激酶盐水）"></label-box>&nbsp; -->
+
+                      <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('常规（肝素盐水）')>-1?true:false" showValue="常规（肝素盐水）"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('常规（肝素盐水）1:1')>-1?true:false" showValue="1:1"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('常规（肝素盐水）1:3')>-1?true:false" showValue="1:3"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('特殊（肝素尿激酶盐水')>-1?true:false" showValue="特殊（肝素尿激酶盐水）"></label-box>&nbsp;
                     </td>
                     <td width='40'>其他</td>
                     <td width='160'>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -214,15 +214,15 @@
                     <td width='80'>内瘘位置：</td>
                     <td width="280">
                       <div>
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('内瘘-左') > -1 ? true : false) : false" showValue="左"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-左') > -1 ? true : false) : false" showValue="左"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('内瘘-右') > -1 ? true : false) : false" showValue="右"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-右') > -1 ? true : false) : false" showValue="右"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('内瘘-前臂') > -1 ? true : false) : false" showValue="前臂"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-前臂') > -1 ? true : false) : false" showValue="前臂"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('内瘘-上臂') > -1 ? true : false) : false" showValue="上臂"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-上臂') > -1 ? true : false) : false" showValue="上臂"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('内瘘-下肢') > -1 ? true : false) : false" showValue="下肢"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-下肢') > -1 ? true : false) : false" showValue="下肢"></label-box>
                         &nbsp;
                       </div>
                     </td>
@@ -720,14 +720,16 @@
                   <tr>
                     <td width="80">封管液配置</td>
                     <td width='50'>
-                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('无') > -1 : false" showValue="无"></label-box>&nbsp;
+                        <!-- <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('无') > -1 : false" showValue="无"></label-box>&nbsp; -->
+                         <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('无')>-1?true:false" showValue="无"></label-box>&nbsp;
                     </td>
                     <td width='70'>
-                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('肝素') > -1 : false" showValue="肝素"></label-box>&nbsp;
+                        <!-- <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('肝素') > -1 : false" showValue="肝素"></label-box>&nbsp; -->
+                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('肝素')>-1?true:false" showValue="肝素"></label-box>&nbsp;
                     </td>
                     <td width='50'>
                         <div class="under-line">
-                            &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('肝素') > -1 : false">
+                            &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose.indexOf('肝素')>-1">
                                 {{ afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).replace(/[^0-9]/ig,"") : '' }}
                             </span>
                         </div>
@@ -735,22 +737,29 @@
                     <td width='10'>ml</td>
 
                     <td width='70'>
-                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('+NS') > -1 : false" showValue="+NS"></label-box>&nbsp;
+                        <!-- <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('+NS') > -1 : false" showValue="+NS"></label-box>&nbsp; -->
+                         <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('+NS')>-1?true:false" showValue="+NS"></label-box>&nbsp;
                     </td>
                     <td width='50'>
                         <div class="under-line">
-                            &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('+NS') > -1 : false">
-                                {{ afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).replace(/[^0-9]/ig,"") : '' }}
+                            &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose.indexOf('+NS')>-1">
+                                {{ afterdialysis.sealing_fluid_dispose ? getSealingFluidDisposetwo(afterdialysis.sealing_fluid_dispose).replace(/[^0-9]/ig,"") : '' }}
                             </span>
                         </div>
                     </td>
                     <td width='10'>ml</td>
                     <td width='30'>
-                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('特殊') > -1 : false" showValue=""></label-box>&nbsp;
+                        <!-- <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('特殊') > -1 : false" showValue=""></label-box>&nbsp; -->
+
+                          <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('特殊')>-1?true:false" showValue=""></label-box>&nbsp;
                     </td>
                     <td width='100'>
                         <div class="under-line">
-                            &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('特殊') > -1 : false">
+                            <!-- &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('特殊') > -1 : false">
+                                {{ afterdialysis.sealing_fluid_special ? afterdialysis.sealing_fluid_special : '' }}
+                            </span> -->
+
+                             &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose.indexOf('特殊')>-1">
                                 {{ afterdialysis.sealing_fluid_special ? afterdialysis.sealing_fluid_special : '' }}
                             </span>
                         </div>
@@ -1335,15 +1344,46 @@ export default {
       return puncture_method_name
     },
     getSealingFluidDispose: function(val) {
-      let sealing_fluid_dispose_name = '/'
-      const sealing_fluid_dispose = getDataConfig("hemodialysis", "sealing_fluid_dispose")
-
-      for (let i = 0; i < sealing_fluid_dispose.length; i++) {
-        if (sealing_fluid_dispose[i].id == val) {
-          sealing_fluid_dispose_name = sealing_fluid_dispose[i].name
+      // let sealing_fluid_dispose_name = '/'
+      // const sealing_fluid_dispose = getDataConfig("hemodialysis", "sealing_fluid_dispose")
+
+      // for (let i = 0; i < sealing_fluid_dispose.length; i++) {
+      //   if (sealing_fluid_dispose[i].id == val) {
+      //     sealing_fluid_dispose_name = sealing_fluid_dispose[i].name
+      //   }
+      // }
+      var strname = ''
+      var str = this.afterdialysis.sealing_fluid_dispose
+      var arr = str.split(',')
+      for(let i=0;i<arr.length;i++){
+        if(arr[i] == "肝素1ml"){
+          strname = "肝素1ml"
+        }
+        if(arr[i] == "肝素5ml"){
+          strname = "肝素5ml"
+        }
+        if(arr[i] == "肝素10ml"){
+          strname = "肝素10ml"
         }
       }
-      return sealing_fluid_dispose_name
+      return strname
+    },
+    getSealingFluidDisposetwo(){
+      var strname = ''
+      var str = this.afterdialysis.sealing_fluid_dispose
+      var arr = str.split(',')
+      for(let i=0;i<arr.length;i++){
+        if(arr[i] == "+NS1ml"){
+          strname = "+NS1ml"
+        }
+        if(arr[i] == "+NS5ml"){
+          strname = "+NS5ml"
+        }
+        if(arr[i] == "+NS10ml"){
+          strname = "+NS10ml"
+        }
+      }
+      return strname
     },
     getAdminUser(id) {
       if (id == 0) {
@@ -1488,6 +1528,7 @@ export default {
           )
           this.afterdialysis = response.data.data.AssessmentAfterDislysis
           console.log('透后评估数据', this.afterdialysis)
+
           this.operators = response.data.data.operators
           this.dialysisOrder =
             response.data.data.dialysisOrder === null

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyOne.vue

@@ -828,14 +828,14 @@
                   <tr>
                     <td width='95' style="text-align:right;">封管液:</td>
                     <td width='370'>
-                      <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('纯肝素') > -1 : false" showValue="纯肝素"></label-box>&nbsp;
-                      <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('尿激酶加生理盐水') > -1 : false" showValue="尿激酶加生理盐水"></label-box>&nbsp;
-                      <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('生理盐水+肝素钠2ml') > -1 : false" showValue="生理盐水+肝素钠2ml"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? afterdialysis.sealing_fluid_dispose.indexOf('纯肝素') > -1 : false" showValue="纯肝素"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? afterdialysis.sealing_fluid_dispose.indexOf('尿激酶加生理盐水') > -1 : false" showValue="尿激酶加生理盐水"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? afterdialysis.sealing_fluid_dispose.indexOf('生理盐水+肝素钠2ml') > -1 : false" showValue="生理盐水+肝素钠2ml"></label-box>&nbsp;
                     </td>
                     <td width='40'>其他</td>
                     <td width='160'>
                       <div class="under-line">
-                        &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('特殊') > -1 : false">{{ afterdialysis.sealing_fluid_special ? afterdialysis.sealing_fluid_special : '' }}</span>
+                        &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose ?afterdialysis.sealing_fluid_dispose.indexOf('特殊') > -1 : false">{{ afterdialysis.sealing_fluid_special ? afterdialysis.sealing_fluid_special : '' }}</span>
                       </div>
                     </td>
                     <td></td>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyThree.vue

@@ -736,15 +736,20 @@
                     </td>
                     <td width="10">ml</td>
                     <td width="160">
-                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('封管肝素') > -1 : false" showValue="封管肝素"></label-box>&nbsp;
-                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('尿激酶') > -1 : false" showValue="尿激酶"></label-box>&nbsp;
+                        <!-- <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('封管肝素') > -1 : false" showValue="封管肝素"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('尿激酶') > -1 : false" showValue="尿激酶"></label-box>&nbsp; -->
+
+                          <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('封管肝素')>-1?true:false" showValue="封管肝素"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('尿激酶')>-1?true:false" showValue="尿激酶"></label-box>&nbsp;
                     </td>
                     <td>
-                        <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('特殊') > -1 : false" showValue="其他"></label-box>&nbsp;
+                        <!-- <label-box :isChecked="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('特殊') > -1 : false" showValue="其他"></label-box>&nbsp; -->
+                          <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('特殊')>-1?true:false" showValue="其他"></label-box>&nbsp;
                     </td>
                     <td width="80">
                       <div class="under-line">
-                        &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('特殊') > -1 : false">{{ afterdialysis.sealing_fluid_special ? afterdialysis.sealing_fluid_special : '' }}</span>
+                        <!-- &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).indexOf('特殊') > -1 : false">{{ afterdialysis.sealing_fluid_special ? afterdialysis.sealing_fluid_special : '' }}</span> -->
+                        &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose.indexOf('特殊')>-1">{{ afterdialysis.sealing_fluid_special ? afterdialysis.sealing_fluid_special : '' }}</span>
                       </div>
                     </td>
                     <td></td>

src/xt_pages/dialysis/template/dialysisPrintOrderFive.vue

@@ -185,9 +185,9 @@
                     <check-box text="长期" :checked="predialysis.venous_catheterization == 1 ? true : false"></check-box>
                     <check-box text="临时" :checked="predialysis.venous_catheterization == 2 ? true : false"></check-box>
                     &emsp;位置:
-                    <check-box text="锁骨下" :checked="predialysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis','vascular_access','锁骨下') ? true : false"></check-box>
-                    <check-box text="颈静脉" :checked="predialysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis','vascular_access','颈静脉') ? true : false"></check-box>
-                    <check-box text="股静脉" :checked="predialysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis','vascular_access','股静脉') ? true : false"></check-box>
+                    <check-box text="锁骨下" :checked="predialysis.blood_access_part_id.indexOf('锁骨下')>-1 ? true : false"></check-box>
+                    <check-box text="颈静脉" :checked="predialysis.blood_access_part_id.indexOf('颈静脉')>-1 ? true : false"></check-box>
+                    <check-box text="股静脉" :checked="predialysis.blood_access_part_id.indexOf('股静脉')>-1 ? true : false"></check-box>
                     <div class="inline_block">
                       其它：
                       <div class="under_line" style="width: 50px;text-align: left">

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -145,9 +145,9 @@
                     <check-box text="长期" :checked="predialysis.venous_catheterization == 1 ? true : false"></check-box>
                     <check-box text="临时" :checked="predialysis.venous_catheterization == 2 ? true : false"></check-box>&emsp;
                     位置:
-                    <check-box text="锁骨下" :checked="predialysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis','vascular_access','锁骨下') ? true : false"></check-box>
-                    <check-box text="颈静脉" :checked="predialysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis','vascular_access','颈静脉') ? true : false"></check-box>
-                    <check-box text="股静脉" :checked="predialysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis','vascular_access','股静脉') ? true : false"></check-box>
+                    <check-box text="锁骨下" :checked="predialysis.blood_access_part_id.indexOf('锁骨下')>-1? true : false"></check-box>
+                    <check-box text="颈静脉" :checked="predialysis.blood_access_part_id.indexOf('颈静脉')>-1? true : false"></check-box>
+                    <check-box text="股静脉" :checked="predialysis.blood_access_part_id.indexOf('股静脉')>-1? true : false"></check-box>
                     <div class="inline_block">
                       其它：
                       <div class="under_line" style="width: 50px;text-align: left">

src/xt_pages/medicalScheduling/class.vue

@@ -320,7 +320,8 @@ export default {
             showError:false,
             limit:10,
             page:1,
-            total:0
+            total:0,
+            minute:0,
         }
     },
     methods:{
@@ -347,8 +348,10 @@ export default {
                     timetwo_type:this.form.timetwo_type,
                     timetwo_end:this.form.timetwo_end,
                     work_time:this.form.work_time,
-                    remarks:this.form.remarks
+                    remarks:this.form.remarks,
+                    minute:this.minute,
                  }
+                 console.log("params",params)
                 saveDoctorSchedules(params).then(response=>{
                   if(response.data.state == 1){
                     var schedules = response.data.data.schedules
@@ -433,6 +436,7 @@ export default {
              this.form.class_attributes = scheduleDetail.class_attributes
              this.form.timeone_start = scheduleDetail.timeone_start
              this.form.timeone_end = scheduleDetail.timeone_end
+             this.minute = scheduleDetail.minute
              if(scheduleDetail.timeone_type == 0){
                 this.form.timeone_type = ""
              }else{
@@ -475,6 +479,7 @@ export default {
              work_time:this.form.work_time,
              remarks:this.form.remarks,
              user_org_id:this.form.user_org_id,
+             minute:this.minute,
          }
         this.$refs[formName].validate(valid=>{
           if(valid){
@@ -552,6 +557,7 @@ export default {
           var timeone = this.timeDifference(this.form.timeone_start,this.form.timeone_end)
            timeone = timeone
        }
+
        if(this.form.timeone_type == 2){
           var hour = this.form.timeone_end.split(":")
           var hous = parseInt(hour[0]) + 24
@@ -575,6 +581,7 @@ export default {
         }
                   
         longtime = timeone + timetwo
+        this.minute = longtime
         this.form.work_time = this.timeStamp(longtime)
      },
      changtimeTwo(){
@@ -609,6 +616,8 @@ export default {
         }
                   
         longtime = timeone + timetwo
+        console.log('longtime',longtime)
+        this.minute = longtime
         this.form.work_time = this.timeStamp(longtime) 
      }
     },

src/xt_pages/medicalScheduling/index.vue

@@ -196,7 +196,7 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                
+
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click="newVisible=false">取 消</el-button>
@@ -250,7 +250,7 @@
                           <el-table-column
                             align="center"
                             label="是否排班">
-                            <template slot-scope="scope">           
+                            <template slot-scope="scope">
                               <el-radio-group v-model="scope.row.is_sort" @change="changeRadio(scope.row)">
                                  <el-radio :label="1">是</el-radio>
                                  <el-radio :label="0">否</el-radio>
@@ -289,7 +289,7 @@
                                     <span v-if="scope.row.user_title == 10">副主任护师</span>
                                     <span v-if="scope.row.user_title == 11">主任护师</span>
                                     <span v-if="scope.row.user_title == 12">运营专员</span>
-                                    <span v-if="scope.row.user_title == 13">运营主管</span>  
+                                    <span v-if="scope.row.user_title == 13">运营主管</span>
                                 </template>
                              </el-table-column>
                                 <el-table-column
@@ -302,7 +302,7 @@
                                 <el-table-column
                                 align="center"
                                 label="是否排班">
-                                <template slot-scope="scope">           
+                                <template slot-scope="scope">
                                   <el-radio-group v-model="scope.row.is_sort" @change="changeRadio(scope.row)">
                                      <el-radio :label="1">是</el-radio>
                                      <el-radio :label="0">否</el-radio>
@@ -379,7 +379,7 @@ export default {
               copyWeek:"",
             },
            rules: {
-             copyWeek: [{ required: true, message: "请选择复制时间段", trigger: "blur" }],  
+             copyWeek: [{ required: true, message: "请选择复制时间段", trigger: "blur" }],
            },
            timeNow:0,
            arrZero:[],
@@ -463,7 +463,7 @@ export default {
                     }
                     this.schedulelist = schedulelist
                 }
-            }) 
+            })
         },
         hangdleClick(val,index,num){
         //  console.log("val",val)
@@ -532,7 +532,7 @@ export default {
             schedule_date:this.getTimestamp(this.schedule_date)
             }
             //  console.log("params",params)
-            
+
             addSchedule(params).then(response=>{
             if(response.data.state == 1){
                 var schedule = response.data.data.schedule
@@ -542,36 +542,36 @@ export default {
                 }
             })
         },
-        formatDate(date){      
-            var year = date.getFullYear()+'.'       
+        formatDate(date){
+            var year = date.getFullYear()+'.'
             var month = (date.getMonth()+1)+'.';
             var day = date.getDate();
             return year+month+day
-        }, 
-        formatDateTwo(date){      
-            var year = date.getFullYear()+'.'       
+        },
+        formatDateTwo(date){
+            var year = date.getFullYear()+'.'
             var month = (date.getMonth()+1)+'.';
             var day = date.getDate();
             return year+month+day
-        }, 
-        addDate(date,n){        
-            date.setDate(date.getDate()+n);        
+        },
+        addDate(date,n){
+            date.setDate(date.getDate()+n);
             return date;
-        },  
+        },
             //
-        setDate(date){           
+        setDate(date){
             var week = date.getDay()-1;
             date = this.addDate(date,week*-1);
             this.currentFirstDate = new Date(date);
             this.currentDate = new Date(date)
-            for(var i = 0;i<this.clen; i++){     
+            for(var i = 0;i<this.clen; i++){
                 this.weekDayArr.push(this.formatDate(i==0 ? date : this.addDate(date,1)))
-            }         
+            }
         },
-            //上一周 
+            //上一周
         lastclick(){
             this.weekDayArr=[]
-            this.setDate(this.addDate(this.currentFirstDate,-7));   
+            this.setDate(this.addDate(this.currentFirstDate,-7));
             if (this.weekNum == 1) {
                 let year = this.nowYear - 1
                 let month = 12
@@ -583,8 +583,8 @@ export default {
             this.getNextWeekList()
         },
             //下一周
-        nextclick(){ 
-            this.weekDayArr=[]                
+        nextclick(){
+            this.weekDayArr=[]
             this.setDate(this.addDate(this.currentFirstDate,7));
             this.weekNum = this.weekNum + 1
             if (this.weekNum == 53) {
@@ -598,16 +598,16 @@ export default {
         },
 
         getYearWeek(year,month,date){
-        /*  
-            dateNow是当前日期 
-            dateFirst是当年第一天  
-            dataNumber是当前日期是今年第多少天  
-            用dataNumber + 当前年的第一天的周差距的和在除以7就是本年第几周  
-        */      
+        /*
+            dateNow是当前日期
+            dateFirst是当年第一天
+            dataNumber是当前日期是今年第多少天
+            用dataNumber + 当前年的第一天的周差距的和在除以7就是本年第几周
+        */
         let dateNow = new Date(year, parseInt(month) - 1, date);
         let dateFirst = new Date(year, 0, 1);
         let dataNumber = Math.round((dateNow.valueOf() - dateFirst.valueOf()) / 86400000);
-        return Math.ceil((dataNumber + ((dateFirst.getDay() + 1) - 1)) / 7);        
+        return Math.ceil((dataNumber + ((dateFirst.getDay() + 1) - 1)) / 7);
         },
         getTimestamp(time) { //把时间日期转成时间戳
         return (new Date(time)).getTime() / 1000
@@ -627,7 +627,7 @@ export default {
             }
             getStaffScheduleList(params).then(response=>{
                 if(response.data.state == 1){
-                    var staffList =  response.data.data.staffList                
+                    var staffList =  response.data.data.staffList
                     // console.log("获取所有排班",staffList)
                     var sevenStr = ""
                     var oneStr = ""
@@ -643,18 +643,18 @@ export default {
                     this.arrFour = []
                     this.arrFive = []
                     this.arrSix = []
-                
+
                     for(let i=0;i<staffList.length;i++){
                     if(staffList[i].schedule_week == 0){
                         staffList[i].class_index = 0
                          var arr = []
-                        this.arrZero.push(staffList[i].class_name)             
+                        this.arrZero.push(staffList[i].class_name)
                         for(let i=0;i<this.arrZero.length;i++){
                            if(this.arrZero[i]!=''){
                               arr.push(this.arrZero[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -681,7 +681,7 @@ export default {
                               arr.push(this.arrOne[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -708,7 +708,7 @@ export default {
                               arr.push(this.arrTwo[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -735,7 +735,7 @@ export default {
                               arr.push(this.arrThree[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -762,7 +762,7 @@ export default {
                               arr.push(this.arrFour[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -790,7 +790,7 @@ export default {
                               arr.push(this.arrFive[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -817,7 +817,7 @@ export default {
                               arr.push(this.arrSix[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -879,7 +879,7 @@ export default {
                     newNurseTableData.sort(this.compare('admin_user_id'))
                     newNurseTableData.map((item,index) => {
                         if (newNurse[index] && item.admin_user_id == newNurse[index].admin_user_id) {
-                    
+
                         }else{
                             newNurse.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
                         }
@@ -897,7 +897,7 @@ export default {
                     newDoctorTableData.sort(this.compare('admin_user_id'))
                     newDoctorTableData.map((item,index) => {
                         if (newDoctor[index] && item.admin_user_id == newDoctor[index].admin_user_id) {
-                    
+
                         }else{
                             newDoctor.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
                         }
@@ -936,8 +936,8 @@ export default {
                     data.push(...newDoctor)
                     data.push(obj)
                     this.tableData = data
-        
-                
+
+
                 }
             })
         },
@@ -954,12 +954,12 @@ export default {
                             }
                         })
                     }
-                    
+
                 }
                 })
                 return newClass
             }
-        
+
         },
         getClassAttributes(name,index){
             if(name != undefined){
@@ -973,19 +973,19 @@ export default {
                             }
                         })
                     }
-                    
+
                 }
                 })
                 return newClass
             }
-        
+
         },
 
-        unique(arr) { 
+        unique(arr) {
             const res = new Map();
             return arr.filter((arr) => !res.has(arr.admin_user_id) && res.set(arr.admin_user_id, 1))
         },
-        
+
         //获取上一周下一周的排班数据
         getNextWeekList(){
             const params = {
@@ -1020,7 +1020,7 @@ export default {
                               arr.push(this.arrZero[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -1047,7 +1047,7 @@ export default {
                               arr.push(this.arrOne[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -1074,7 +1074,7 @@ export default {
                               arr.push(this.arrTwo[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -1101,7 +1101,7 @@ export default {
                               arr.push(this.arrThree[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -1128,7 +1128,7 @@ export default {
                               arr.push(this.arrFour[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -1156,7 +1156,7 @@ export default {
                               arr.push(this.arrFive[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -1183,7 +1183,7 @@ export default {
                               arr.push(this.arrSix[i])
                            }
                         }
-                        var countedNames = arr.reduce(function (allNames, name) { 
+                        var countedNames = arr.reduce(function (allNames, name) {
                             if (name in allNames) {
                                 allNames[name]++;
                             }
@@ -1245,7 +1245,7 @@ export default {
                     newNurseTableData.sort(this.compare('admin_user_id'))
                     newNurseTableData.map((item,index) => {
                         if (newNurse[index] && item.admin_user_id == newNurse[index].admin_user_id) {
-                    
+
                         }else{
                             newNurse.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
                         }
@@ -1310,13 +1310,13 @@ export default {
             const params = {
             start_time:this.getTimestamp(this.weekDayArr[0]),
             end_time:this.getTimestamp(this.weekDayArr[6]),
-            doctor_id:id 
+            doctor_id:id
             }
             getScheduleByDoctorId(params).then(response=>{
                 if(response.data.state == 1){
                     var  staffList =  response.data.data.staffList
                     // console.log("staffList",staffList)
-    
+
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) === -1) {
@@ -1362,7 +1362,7 @@ export default {
                         newNurseTableData.sort(this.compare('admin_user_id'))
                         newNurseTableData.map((item,index) => {
                             if (newNurse[index] && item.admin_user_id == newNurse[index].admin_user_id) {
-                        
+
                             }else{
                                 newNurse.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
                             }
@@ -1403,7 +1403,7 @@ export default {
                         newDoctorTableData.sort(this.compare('admin_user_id'))
                         newDoctorTableData.map((item,index) => {
                             if (newDoctor[index] && item.admin_user_id == newDoctor[index].admin_user_id) {
-                        
+
                             }else{
                                 newDoctor.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
                             }
@@ -1422,7 +1422,7 @@ export default {
                         newNurseTableData.sort(this.compare('admin_user_id'))
                         newNurseTableData.map((item,index) => {
                             if (newNurse[index] && item.admin_user_id == newNurse[index].admin_user_id) {
-                        
+
                             }else{
                                 newNurse.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
                             }
@@ -1470,7 +1470,7 @@ export default {
                         this.doctorlist.sort(this.compare('admin_user_id'))
                         this.doctorlist.forEach((item, index) => {
                           if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
-                        
+
                           }else{
                             arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
                             // console.log("arr",arr)
@@ -1521,7 +1521,7 @@ export default {
             //     }else{
             //     this.$message.error("排班已存在")
             //     }
-            // }) 
+            // })
         },
         toContinuous(){
             var is_status = 0
@@ -1561,8 +1561,8 @@ export default {
                }
             }
            var start = label.split('~')
-           var copy_startime = this.getTimestamp(start[0])   
-           var copy_endtime = this.getTimestamp(start[1]) 
+           var copy_startime = this.getTimestamp(start[0])
+           var copy_endtime = this.getTimestamp(start[1])
 
             const params = {
               start_time:this.getTimestamp(this.weekDayArr[0]),
@@ -1600,7 +1600,7 @@ export default {
             if (week.length == 14) {
                 weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]+week[12]
             }
-            
+
             //  console.log("week",week)
             //  console.log("weeks",weeks)
             var weekdate =  this.getTimestamp(weeks)
@@ -1617,31 +1617,31 @@ export default {
         changeSort(val){
           console.log('val',val)
             const params = {
-              sort:parseInt(val.sort), 
-              id:val.id, 
+              sort:parseInt(val.sort),
+              id:val.id,
             }
             console.log("params",params)
-          SaveNurseSort(params).then(response=>{
-             if(response.data.state == 1){
-               var role = response.data.data.role
-               this.$message.success("保存成功")
-               this.getDoctorList()
-             }
-          })
+          // SaveNurseSort(params).then(response=>{
+          //    if(response.data.state == 1){
+          //      var role = response.data.data.role
+          //      this.$message.success("保存成功")
+          //      this.getDoctorList()
+          //    }
+          // })
         },
        changeRadio(val){
           console.log("val",val)
            const params = {
               id:val.id,
-              is_sort:val.is_sort, 
+              is_sort:val.is_sort,
            }
-         SaveIsSchedule(params).then(response=>{
-            if(response.data.state == 1){
-              var role =  response.data.data.role
-              this.$message.success("保存成功")
-              this.getDoctorList()
-            }
-         })
+         // SaveIsSchedule(params).then(response=>{
+         //    if(response.data.state == 1){
+         //      var role =  response.data.data.role
+         //      this.$message.success("保存成功")
+         //      this.getDoctorList()
+         //    }
+         // })
        }
     },
     created(){
@@ -1669,19 +1669,19 @@ export default {
                 let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
                 this.timeOptions.push({value:i,label:stt})
             }else{
-                
+
                 newNum++
                 let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + newNum + ')'
-                this.typeOptions.push({value:i,label:str}) 
+                this.typeOptions.push({value:i,label:str})
                 let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
-                this.timeOptions.push({value:i,label:stt}) 
+                this.timeOptions.push({value:i,label:stt})
             }
-            
+
         }
       var now = moment().locale('zh-cn').format('YYYY-MM-DD 00:00:00')
       this.timeNow = this.getTimestamp(now)
-      
-      
+
+
     }
 }
 </script>
@@ -1706,7 +1706,7 @@ export default {
         background-color: rgb(245, 247, 250);
         color: rgb(96, 98, 102);
         font-weight:bold;
-        
+
     }
     .classMain{
         height: 400px;

src/xt_pages/role/admin.vue

@@ -58,12 +58,6 @@
           min-width="160"
           align="center"
         ></el-table-column>
-        <el-table-column
-          label="职称"
-          prop="title_name"
-          min-width="160"
-          align="center"
-        ></el-table-column>
         <el-table-column label="状态" min-width="100" align="center">
           <template slot-scope="scope">
             <div
@@ -191,7 +185,9 @@ export default {
         this.is_loading_admins = false;
         var resp = rs.data;
         if (resp.state === 1) {
-          this.admins.push(...resp.data.admins);
+           var adminData = resp.data.admins
+           console.log("数据",adminData)
+          this.admins.push(...adminData);
           this.admin_total_count = resp.data.total_count;
           this.is_exist_role = resp.data.is_exist_role;
           this.current_page = 1;
@@ -268,7 +264,8 @@ export default {
           const resp = rs.data;
           console.log(resp);
           if (resp.state === 1) {
-            this.admins.push(...resp.data.admins);
+             var admindata = resp.data.admins
+            this.admins.push(...admindata);
             this.admin_total_count = resp.data.total_count;
           } else {
             this.$message.error(resp.msg);

src/xt_pages/role/components/AdminInfoForm.vue

@@ -117,7 +117,7 @@
           user_type: '',
           user_title: '',
           role: '', // 其实应该是 int 类型
-          intro: ''
+          intro: '',
         },
         rules: {
           mobile: [{ required: true, validator: checkMobile, trigger: 'blur' }],
@@ -159,6 +159,7 @@
             .then(rs => {
               this.loading = false
               var resp = rs.data
+              
               if (resp.state === 1) {
                 // this.roles.push(...resp.data.roles)
                 this.roles = resp.data.roles
@@ -254,7 +255,7 @@
 
         this.dialogFormVisible = true
       },
-      submitAction: function() {
+      submitAction: function() {     
         if (this.admin_id < 0) {
           return
         }
@@ -276,8 +277,7 @@
                 this.form.role,
                 this.form.intro,
                 this.form.user_title_name
-              )
-                .then(rs => {
+              ).then(rs => {
                   this.loading = false
                   var resp = rs.data
                   if (resp.state === 1) {
@@ -305,7 +305,7 @@
                 this.form.user_title,
                 this.form.role,
                 this.form.intro,
-                this.form.user_title_name
+                this.form.user_title_name,
               )
                 .then(rs => {
                   this.loading = false