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

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

@@ -124,3 +124,27 @@ export function UpdateContinusSchedule(params) {
     params: params
   })
 }
+
+export function SaveNurseSort(params) {
+  return request({
+    url: '/api/schedule/savenursesort',
+    methods: 'Get',
+    params: params
+  })
+}
+
+export function SaveIsSchedule(params) {
+  return request({
+    url: '/api/schedule/saveisschedule',
+    methods: 'get',
+    params: params
+  })
+}
+
+export function getScheduleListTotal(params) {
+  return request({
+    url: '/api/schedule/getscheudlelisttotal',
+    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/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_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/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/index.vue

@@ -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) {
@@ -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(

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

@@ -4,20 +4,20 @@
       id="dialysis-print-box-1-1"
       class="dialysis-print-order print-template-two print_page_main_content"
     >
-    <div style="width:100%;text-align:center;">
+    <!-- <div style="width:100%;text-align:center;">
         <div
           class="order-yy-name"
           style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;"
         >
           {{ orgname }}
         </div>
-    </div>
+    </div> -->
       <div style="display:inline-block;width:100%;text-align:center;">
         <div
           class="order-title"
           style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;"
         >
-          血液净化治疗记录单
+         {{ orgname }} 血液净化治疗记录单
         </div>
       </div>
       <div class="row">
@@ -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>
@@ -299,12 +307,31 @@
         <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
           {{ predialysis.is_hemorrhage == 1 && predialysis.hemorrhage ? predialysis.hemorrhage : "" }}
         </div>
-        风险跌倒评估
+        跌倒风险预防措施
+        <div class="inline_block under_line" style="width:100px;text-align: center;">
+          {{ receiverTreatmentAccess.precaution ? receiverTreatmentAccess.precaution : '' }}
+        </div>
+      </div>
+      <div class="row">
+        上机医生
+        <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+          <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
+          <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
+        </div>
+        冲管护士
+        <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+          <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)}}</span>
+          <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)" alt="" srcset="" v-else>
+        </div>
+        穿刺者
+        <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+          <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
+          <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
+        </div>
+        上机护士
         <div class="inline_block under_line" style="width:100px;text-align: center;">
-          <span v-if="receiverTreatmentAccess.danger_level == 1">无</span>
-          <span v-if="receiverTreatmentAccess.danger_level == 2">低风险</span>
-          <span v-if="receiverTreatmentAccess.danger_level == 3">中度风险</span>
-          <span v-if="receiverTreatmentAccess.danger_level == 4">高风险</span>
+          <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
+          <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
         </div>
       </div>
 
@@ -398,8 +425,8 @@
 
       <table class="print-table" border="1">
         <tbody>
-          <tr style="height:40px;line-height:40px">
-            <td width="50" rowspan="2" style="padding-left:5px;border:none;border-right:1px solid #000;">
+          <tr style="height:30px;line-height:30px">
+            <td width="70" rowspan="3" style="padding-left:5px;border:none;border-right:1px solid #000;">
               透后评估
             </td>
 
@@ -442,8 +469,8 @@
             </td>
           </tr>
             
-          <tr style="height:40px;line-height:40px;">
-            <td width="70" style="border:none;padding-left:5px">实际置换量:</td>
+          <tr style="height:30px;line-height:30px;">
+            <td width="90" style="border:none;padding-left:5px">实际置换量:</td>
             <td width="30" style="text-align:left;border:none;">
               <div>
                 <span class="under_line" style="width:50px;display:inline-block">
@@ -452,8 +479,8 @@
               </div>
             </td>
             
-            <td width="70" style="border:none;padding-left:5px">透析器凝血:</td>
-            <td width="150" style="text-align:left;border:none;">
+            <td width="90" style="border:none;padding-left:5px">透析器凝血:</td>
+            <td width="200" style="text-align:left;border:none;">
               <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-0度') > -1 ? true : false) :false" showValue="0"></label-box>
               <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false) :false" showValue="+"></label-box>
               <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1 ? true : false) :false" showValue="+ +"></label-box>
@@ -461,8 +488,8 @@
             </td>
             <!-- <td width="50" style="text-align:left;border:none;"></td> -->
             <!-- <td width="110" style="text-align:left;border:none;"></td> -->
-            <td width="80" style="border:none;padding-left:5px">透析期间进食:</td>
-            <td width="50" style="text-align:left;border:none;    padding-bottom: 10px;">
+            <td width="100" style="border:none;padding-left:5px">透析期间进食:</td>
+            <td width="50" style="text-align:left;border:none;">
               <div>
                 <span class="under_line" style="width:50px;display:inline-block">
                   <span v-if='afterdialysis.is_eat == 1'>是</span>
@@ -479,6 +506,30 @@
               </div>
             </td>
           </tr>
+          <tr style="height:30px;line-height:30px;">
+            <td width="20" style="border:none;padding-left:5px;">内瘘:</td>
+            <td width="150" colspan="3" style="text-align:left;border:none;">
+              <div>
+                <span class="under_line" style="width:150px;display:inline-block;">
+                  {{ afterdialysis.internal_fistula ? afterdialysis.internal_fistula : "" }}
+                </span>
+              </div>
+            </td>
+            <td width="50" style="border:none;padding-left:5px">下机护士:</td>
+            <td width="100" style="text-align:left;border:none;">
+              <div>
+                <span class="under_line" style="width:100px;display:inline-block">
+                  <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) == ''">
+                    {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) }}</span>
+                  <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse)" alt="" srcset="" v-else />
+                </span>
+              </div>
+            </td>
+            <td width="10" style="text-align:left;border:none;"></td>
+            <td width="110" style="text-align:left;border:none;"></td>
+            <!-- <td width="110" style="text-align:left;border:none;"></td> -->
+            <!-- <td width="110" style="text-align:left;border:none;"></td> -->
+          </tr>
         </tbody>
       </table>
 
@@ -499,7 +550,7 @@
                     <img :src="orderForm.url" style="height:30px;" />
                 </span>
             </span>
-            校对护士
+            二核护士
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
               <span v-if="dialysisOrder ? dialysisOrder.start_nurse != check.modifier : false">
@@ -1100,6 +1151,20 @@ export default {
             receiverTreatmentAccess.way = '平车'
           }
           console.log('接诊评估:', receiverTreatmentAccess)
+          var obj = receiverTreatmentAccess.precaution
+          var arr = obj.split(',')
+          console.log('arr', arr)
+          var arr2 = []
+          for (let i = 0; i < this.precaution_arr.length; i++) {
+            for (let j = 0; j < arr.length; j++) {
+              if (this.precaution_arr[i].id == parseInt(arr[j])) {
+                arr2.push(this.precaution_arr[i].name)
+              }
+            }
+          }
+          var obj2 = arr2.join(',')
+          console.log('obj2', obj2)
+          receiverTreatmentAccess.precaution = obj2
           this.receiverTreatmentAccess = receiverTreatmentAccess
           this.prescription.mode = this.modeName(this.prescription.mode_id)
           var rwLen = this.replacementWays.length

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

@@ -192,23 +192,23 @@
                     <td width='10'>A</td>
                     <td width='120'>
                         <div class="under-line">&nbsp;
-                            <span v-if="predialysis.pinholing.indexOf('A1')>-1">A1,</span>
-                            <span v-if="predialysis.pinholing.indexOf('A2')>-1">A2,</span>
-                            <span v-if="predialysis.pinholing.indexOf('A3')>-1">A3,</span>
-                            <span v-if="predialysis.pinholing.indexOf('A4')>-1">A4,</span>
-                            <span v-if="predialysis.pinholing.indexOf('A5')>-1">A5,</span>
-                            <span v-if="predialysis.pinholing.indexOf('A6')>-1">A6</span>
+                            <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('A1')>-1">A1,</span>
+                            <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('A2')>-1">A2,</span>
+                            <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('A3')>-1">A3,</span>
+                            <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('A4')>-1">A4,</span>
+                            <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('A5')>-1">A5,</span>
+                            <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('A6')>-1">A6</span>
                         </div>
                     </td>
                     <td width='10'>V</td>
                     <td width='120'>
                         <div class="under-line">&nbsp;
-                            <span v-if="predialysis.pinholing.indexOf('V1')>-1">V1,</span>
-                            <span v-if="predialysis.pinholing.indexOf('V2')>-1">V2,</span>
-                            <span v-if="predialysis.pinholing.indexOf('V3')>-1">V3,</span>
-                            <span v-if="predialysis.pinholing.indexOf('V4')>-1">V4,</span>
-                            <span v-if="predialysis.pinholing.indexOf('V5')>-1">V5,</span>
-                            <span v-if="predialysis.pinholing.indexOf('V6')>-1">V6</span>
+                            <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('V1')>-1">V1,</span>
+                            <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('V2')>-1">V2,</span>
+                            <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('V3')>-1">V3,</span>
+                            <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('V4')>-1">V4,</span>
+                            <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('V5')>-1">V5,</span>
+                            <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('V6')>-1">V6</span>
                         </div>
                     </td>
                     <td width='80'>内瘘位置：</td>
@@ -329,9 +329,9 @@
                     <td width='70'>导管缝线</td>
                     <td width='120'>
                         <div>
-                            <label-box :isChecked="predialysis.catheter_suture.indexOf('固定') > -1 ? true : false" showValue="固定"></label-box>
+                            <label-box :isChecked="predialysis.catheter_suture && predialysis.catheter_suture.indexOf('固定') > -1 ? true : false" showValue="固定"></label-box>
                             &nbsp;
-                            <label-box :isChecked="predialysis.catheter_suture.indexOf('松脱') > -1 ? true : false" showValue="松脱"></label-box>
+                            <label-box :isChecked="predialysis.catheter_suture && predialysis.catheter_suture.indexOf('松脱') > -1 ? true : false" showValue="松脱"></label-box>
                             &nbsp;
                         </div>
                     </td>
@@ -427,7 +427,7 @@
                     <td width='10'>ml</td>
                     <td width='40'>水肿</td>
                     <td width='40'>
-                        <label-box :isChecked="predialysis.edema.indexOf('无') > -1 ? true : false" showValue="无"></label-box>
+                        <label-box :isChecked="predialysis.edema && predialysis.edema.indexOf('无') > -1 ? true : false" showValue="无"></label-box>
                     </td>
                     <td width='30'>
                         <label-box :isChecked="predialysis.edema && getEdema(predialysis.edema) != '' ? true : false" showValue=""></label-box>
@@ -579,14 +579,14 @@
                             <td width='60'>透析器</td>
                             <td width='120'>
                                 <div class="under-line">
-                                    &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus.split(',')[0].indexOf('透析器') > -1 ? prescription.dialyzer_perfusion_apparatus.split(',')[0].slice(3) : prescription.dialyzer_perfusion_apparatus.split(',')[1].slice(3) : '' }}
+                                    &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? getDialyzerPerfusionApparatus(prescription.dialyzer_perfusion_apparatus,'透析器') : '' }}
                                 </div>
                             </td>
                             <td width='20'></td>
                             <td width='80'>灌流器</td>
                             <td width='120'>
                                 <div class="under-line">
-                                    &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus.split(',')[0].indexOf('灌流器') > -1 ? prescription.dialyzer_perfusion_apparatus.split(',')[0].slice(3) : prescription.dialyzer_perfusion_apparatus.split(',')[1].slice(3) : '' }}
+                                    &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? getDialyzerPerfusionApparatus(prescription.dialyzer_perfusion_apparatus,'灌流器') : '' }}
                                 </div>
                             </td>
                             <td></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>
@@ -1227,6 +1236,21 @@ export default {
     }
   },
   methods: {
+    getDialyzerPerfusionApparatus(dialyzer_perfusion_apparatus,name){
+      let str = ''
+      if(dialyzer_perfusion_apparatus.indexOf(',') > -1){
+        dialyzer_perfusion_apparatus.split(',').map(item => {
+          if(item.indexOf(name) > -1){
+            str = item.slice(3)
+          }
+        })
+      }else {
+        if(dialyzer_perfusion_apparatus.indexOf(name) > -1){
+          str = dialyzer_perfusion_apparatus.slice(3)
+        }
+      }
+      return str
+    },
     getComplication(complication){
       if(complication.indexOf(',') == -1){
         let str = complication
@@ -1320,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) {
@@ -1473,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

@@ -3,7 +3,7 @@
         <div class="position">
             <bread-crumb :crumbs="crumbs"></bread-crumb>
             <div style="display:flex;align-items:center">
-                <!-- <el-button type="primary" @click="setting">设置</el-button> -->
+                <el-button type="primary" @click="setting">设置</el-button>
                 <el-button type="primary" @click="DeleteStaffSchedule">清除</el-button>
                 <el-button type="primary" @click="copyStaffSchedule">复制</el-button>
                 <el-button type="primary" icon="el-icon-printer" @click="toPrint">打印</el-button>
@@ -433,21 +433,21 @@ export default {
                     //获取班种列表
                     this.getStaffScheduleList()
 
-                    // var doctorlist =  response.data.data.doctorlist
-                    // for(let i=0;i<doctorlist.length;i++){
-                    //    if(doctorlist[i].sort == 0){
-                    //       doctorlist[i].sort = ""
-                    //    }
-                    // }
-                    // console.log('doctorlist',doctorlist)
-                    // this.doctorList = doctorlist
-                    // var nurselist = response.data.data.nurselist
-                    // for(let i=0;i<nurselist.length;i++){
-                    //    if(nurselist[i].sort == 0){
-                    //        nurselist[i].sort = ""
-                    //    }
-                    // }
-                    // this.nurseList = nurselist
+                    var doctorlist =  response.data.data.doctorlist
+                    for(let i=0;i<doctorlist.length;i++){
+                       if(doctorlist[i].sort == 0){
+                          doctorlist[i].sort = ""
+                       }
+                    }
+                    console.log('doctorlist',doctorlist)
+                    this.doctorList = doctorlist
+                    var nurselist = response.data.data.nurselist
+                    for(let i=0;i<nurselist.length;i++){
+                       if(nurselist[i].sort == 0){
+                           nurselist[i].sort = ""
+                       }
+                    }
+                    this.nurseList = nurselist
                 }
             })
         },

src/xt_pages/medicalScheduling/schedulingStatistics.vue

@@ -123,7 +123,7 @@
 import echarts from "echarts";
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import LineChart from "../qcd/components/LineChart";
-import { getScheduleList }  from '@/api/doctorSchedule'
+import { getScheduleList,getScheduleListTotal }  from '@/api/doctorSchedule'
 export default {
     components:{
         BreadCrumb,
@@ -398,8 +398,13 @@ export default {
            }
           getScheduleListTotal(params).then(response=>{
              if(response.data.state == 1){
-               var list =  response.data.data.list
+                //获取每个班次对应的次数
+               var scheudleTotal =  response.data.data.scheudletotal
+               console.log("scheudletotal",scheudleTotal)
+               //获取总分钟数
+               var list = response.data.data.list
                console.log("list",list)
+
              }
           })
         }

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