Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -307,7 +307,7 @@
                       <check-box text="HF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 5)"></check-box>
                       <check-box text="HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 4)"></check-box>
                       <check-box text="HD+HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 3)"></check-box>
-                      <check-box text="SCUF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 6)"></check-box>
+                      <!-- <check-box text="SCUF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 6)"></check-box>
                       <check-box text="IUF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 7)"></check-box>
                       <check-box text="HFHD" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 8)"></check-box>
                       <check-box text="HFHD+HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 9)"></check-box>
@@ -319,7 +319,7 @@
                       <check-box text="HD前置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 15)"></check-box>
                       <check-box text="HD后置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 16)"></check-box>
                       <check-box text="HDF前置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 17)"></check-box>
-                      <check-box text="HDF后置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 18)"></check-box>
+                      <check-box text="HDF后置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 18)"></check-box> -->
                       其他
                       <div class="under_line" style="width: 100px;">
                         {{record.prescription&&record.prescription.mode_id>5?modeName(record.prescription.mode_id):''}}

src/xt_pages/dialysis/details/BasicInfor.vue

@@ -50,6 +50,7 @@
 <script>
 const moment = require('moment')
 import { parseTime } from '@/utils'
+import { jsGetAge, uParseTime } from '@/utils/tools'
 
 export default {
   name: 'BasicInfor',

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -172,11 +172,11 @@
           <span class="content" v-if="getValueStr('anticoagulant','anticoagulant') != 1">{{anticoagulant_weichi != '0'?anticoagulant_weichi:""}}</span>
           <span class="content" v-if="getValueStr('anticoagulant','anticoagulant') == 1"></span>
 
-          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 2">{{anticoagulant_weichi != '0'?"iu":""}}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 3">{{anticoagulant_weichi != '0'?"iu":""}}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 1">{{anticoagulant_weichi != '0'?"mg":""}}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 4">{{anticoagulant_weichi != '0'?"mg":""}}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{anticoagulant_weichi != '0'?"ml":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 2">{{anticoagulant_weichi != '0'?"iu/h":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 3">{{anticoagulant_weichi != '0'?"iu/h":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 1">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 4">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{anticoagulant_weichi != '0'?"ml/h":""}}</span>
         </li>
 
         <li v-if="isShow('钙')">
@@ -220,7 +220,6 @@
         </li>
       </ul>
     </div>
-    <div class="note">备注 : <span>{{note}}</span></div>
   </div>
 </template>
 
@@ -235,6 +234,8 @@
         title: "透析处方",
         perfusion_apparatus_map: {},
         dialysateFormulationMap:{},
+        blood_access_part:[],
+        blood_access_part_opera:[],
       };
     },
     props: {
@@ -380,9 +381,6 @@
       },
       dialyzer_perfusion_apparatus: function() {
         return this.getValueStr("dialyzer_perfusion_apparatus", "dialyzer_perfusion_apparatus")
-      },
-      note: function() {
-        return this.getValueStr("remark", "remark")
       },body_fluid:function () {
         var id =  this.getValueStr("body_fluid", "body_fluid")
         if(id == 0){
@@ -451,6 +449,8 @@
       this.perfusion_apparatus_map = map
 
       var dialysateFormulationOptions = getDataConfig('hemodialysis','dialysate_formulation');
+
+
       for(var index in dialysateFormulationOptions){
         this.dialysateFormulationMap[dialysateFormulationOptions[index].id] = dialysateFormulationOptions[index];
       }
@@ -468,6 +468,7 @@
           if (this.solution[skey] == null || this.solution[skey] == undefined) {
             return ""
           }
+
           return this.solution[skey] + ""
         }
       },isShow(name){

src/xt_pages/dialysis/details/NavIgation.vue

@@ -67,6 +67,7 @@
                                   :admin_users="admin_users" :targetAdvices="longAdvices"
                                   :waitUploadAdvices="waitUploadAdvices" :is_open="is_open"
 
+
                                   :predialysis="predialysis_evaluation"
                                   :last_predialysis="last_predialysis_evaluation"
                                   :record="assessment_after_dislysis"

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -96,7 +96,7 @@
           <label>血管杂音 : </label>
           <span class="content">{{getBloodAccessNoise(this.record.blood_access_noise)}}</span>
         </li>
-     
+
         <li v-if="isShow('穿刺针')">
           <label>穿刺针 : </label>
           <span class="content">{{this.record.puncture_needle}}</span>
@@ -164,6 +164,19 @@
           <span class="content">{{ skin_other }}</span>
           <span class="unit"> </span>
         </li>
+
+        <li  v-if="isShow('血管通路部位')">
+          <label>血管通路部位:</label>
+          <span class="content">{{ getBloodAccessPart(this.record.blood_access_part_id) }}</span>
+          <span class="unit"> </span>
+        </li>
+
+        <li  v-if="isShow('血管通路操作')">
+          <label>血管通路操作:</label>
+          <span class="content">{{ getBloodAccessOpera(this.record.blood_access_part_opera_id) }}</span>
+          <span class="unit"> </span>
+        </li>
+
       </ul>
     </div>
     <div class="note">备注 : <span>{{ remark }}</span></div>
@@ -174,6 +187,7 @@
 
 <script>
   import store from '@/store'
+  import {getDataConfig} from '@/utils/data';
 
 export default {
   name: 'assessmentBefore',
@@ -360,6 +374,27 @@ export default {
       }
   },
   methods: {
+    getBloodAccessPart: function(id) {
+      var BloodAccessPart = getDataConfig('hemodialysis', 'vascular_access')
+      var BloodAccessPartName = ''
+      for (let i = 0; i < BloodAccessPart.length; i++) {
+        if (BloodAccessPart[i].id == id) {
+          BloodAccessPartName = BloodAccessPart[i].name
+        }
+      }
+      return BloodAccessPartName
+    },
+    getBloodAccessOpera: function(id) {
+      var BloodAccessOpera =  getDataConfig('hemodialysis', 'vascular_access_desc')
+      var BloodAccessOperaName = ''
+      for (let i = 0; i < BloodAccessOpera.length; i++) {
+        if (BloodAccessOpera[i].id == id) {
+          BloodAccessOperaName = BloodAccessOpera[i].name
+        }
+      }
+      return BloodAccessOperaName
+    },
+
       getBloodAccessInternalFistula: function(id) {
         var BloodAccessInternalFistulaOptions = this.$store.getters.blood_access_internal_fistula
         var BloodAccessInternalFistulaName = ''

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

@@ -423,7 +423,7 @@
     </el-dialog>
 
 
-    <el-dialog title="调整干体重  " :visible.sync="dialogFormVisible" width="50%">
+    <el-dialog title="调整干体重  " :visible.sync="dialogFormVisible" width="50%"   @close="cancleDryWeight()">
       <el-form :model="weight_adjust" ref="weight_adjust">
         <el-form-item label="干体重 :" label-width="80px" >
           <el-input style="width: 200px" v-model="weight_adjust.weight" auto-complete="off"></el-input>

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

@@ -558,6 +558,9 @@
     name: 'dialysisPrescriptionDialog',
     components: { MsgTip },
     props: {
+      schedual: {
+        type: Object
+      },
       is_open: {
         type: Number,
         default: () => {
@@ -738,6 +741,11 @@
         default: () => {
           return { id: 0 }
         }
+      },last_prescription: {
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
       },
 
     },
@@ -1985,6 +1993,29 @@
 
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
+
+
+
+      if (this.prescription != null && typeof (this.prescription.id) != 'undefined' && this.prescription.id > 0) {
+        for (const key in this.prescription) {
+          this.dialysisPrescription[key] = this.prescription[key]
+        }
+      } else if (this.solution != null && typeof this.solution.id != 'undefined' && this.solution.id) {
+        for (const key in this.solution) {
+            this.dialysisPrescription[key] = this.solution[key]
+        }
+      } else if (this.last_prescription != null && typeof this.last_prescription.id != 'undefined' && this.last_prescription.id) {
+
+        for (const key in this.last_prescription) {
+            this.dialysisPrescription[key] = this.last_prescription[key]
+        }
+      } else {
+        this.dialysisPrescription.mode_id = this.schedual.mode_id
+
+      }
+
+
+
     },
     watch: {
       "dialysisPrescription.dialysis_duration_hour":function(){
@@ -2057,13 +2088,11 @@
         let  dialysis_duration_minute = 0
         let dialysis_duration_hour = 0
         let duration = 0
-
         if (this.dialysisPrescription.dialysis_duration_minute == ''){
           dialysis_duration_minute = 0
         }else{
           dialysis_duration_minute = this.dialysisPrescription.dialysis_duration_minute
         }
-
         if (this.dialysisPrescription.dialysis_duration_hour == ''){
           dialysis_duration_hour = 0
 
@@ -2073,10 +2102,6 @@
 
         }
         duration = parseFloat(dialysis_duration_hour) * 60 + parseFloat(dialysis_duration_minute)
-
-
-        console.log(duration)
-
         this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
           this.dialysisPrescription.anticoagulant_shouji,
           duration,
@@ -2107,8 +2132,6 @@
         }
         duration = parseFloat(dialysis_duration_hour) * 60 + parseFloat(dialysis_duration_minute)
 
-        console.log(duration)
-
         this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
           this.dialysisPrescription.anticoagulant_shouji,
           duration,
@@ -2123,25 +2146,16 @@
             this.dialysisPrescription[index] = this.prescription[index]
           }
 
-          // console.log(this.prescription['dialysate_formulation'])
 
           if (this.prescription['dialysate_formulation'] == 0) {
             this.dialysisPrescription['dialysate_formulation'] = ''
           }
 
-          // else{
-          //   this.dialysisPrescription['dialysate_formulation']  = this.prescription['dialysate_formulation']
-          //
-          // }
-          //
-          //
+
           if (this.prescription['anticoagulant'] == 0) {
             this.dialysisPrescription['anticoagulant'] = ''
           }
-          // else{
-          //   this.dialysisPrescription['anticoagulant']  = this.prescription['anticoagulant']
-          //
-          // }
+
 
           if (this.prescription['dialysis_duration_hour'] == 0) {
             this.dialysisPrescription['dialysis_duration_hour'] = ''
@@ -2208,21 +2222,9 @@
             if (this.prescription['dialysate_formulation'] == 0) {
               this.dialysisPrescription['dialysate_formulation'] = ''
             }
-
-            // else{
-            //   this.dialysisPrescription['dialysate_formulation']  = this.prescription['dialysate_formulation']+''
-            //
-            // }
-            //
-            //
             if (this.prescription['anticoagulant'] == 0) {
               this.dialysisPrescription['anticoagulant'] = ''
             }
-            //
-            // else{
-            //   this.dialysisPrescription['anticoagulant']  = this.prescription['anticoagulant']+''
-            //
-            // }
 
             if (this.prescription['dialysis_duration_hour'] == 0) {
               this.dialysisPrescription['dialysis_duration_hour'] = ''
@@ -2286,10 +2288,7 @@
             if (this.solution['dialysate_formulation'] == 0) {
               this.dialysisPrescription['dialysate_formulation'] = ''
             }
-            // else{
-            //   this.dialysisPrescription['dialysate_formulation']  = this.solution['dialysate_formulation']+''
-            //
-            // }
+
 
             if (this.solution['anticoagulant'] == 0) {
               this.dialysisPrescription['anticoagulant'] = ''

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

@@ -158,13 +158,26 @@
             </el-col>
             <el-col :span="8"  v-if="isShow('静脉压')">
               <el-form-item label="静脉压(mmHg)：">
-                <el-input v-model="form.venous_pressure"></el-input>
+                <el-input style="width: 140px" v-model="form.venous_pressure"></el-input>
+                <el-button
+                  size="mini"
+                  type="primary"
+                  @click="venousPressureChange(1)"
+                >转换</el-button>
               </el-form-item>
+
+
             </el-col>
             <el-col :span="8" v-if="isShow('动脉压')">
               <el-form-item label="动脉压(mmHg)：">
-                <el-input v-model="form.arterial_pressure"></el-input>
+                <el-input style="width: 140px" v-model="form.arterial_pressure"></el-input>
+                <el-button
+                  size="mini"
+                  type="primary"
+                  @click="venousPressureChange(3)"
+                >转换</el-button>
               </el-form-item>
+
             </el-col>
 
             <el-col :span="8" v-if="isShow('血流量')">
@@ -172,24 +185,18 @@
                 <el-input v-model="form.blood_flow_volume"></el-input>
               </el-form-item>
             </el-col>
-          <!-- </el-row>
-
-          <el-row :gutter="20"> -->
-
-
-
-
-          <!-- </el-row>
-
-          <el-row :gutter="20"> -->
 
             <el-col :span="8" v-if="isShow('跨膜压')">
               <el-form-item label="跨膜压(mmHg)：">
-                <el-input v-model="form.transmembrane_pressure"></el-input>
+                <el-input  style="width: 140px" v-model="form.transmembrane_pressure"></el-input>
+                <el-button
+                  size="mini"
+                  type="primary"
+                  @click="venousPressureChange(2)"
+                >转换</el-button>
               </el-form-item>
-            </el-col>
-
 
+            </el-col>
 
             <el-col :span="8" v-if="isShow('超滤率')">
               <el-form-item label="超滤率(ml/h)">
@@ -395,6 +402,21 @@ export default {
       this.form.operate_time = (new Date()).getTime()
     },
     methods: {
+      venousPressureChange (type) {
+        if (type == 1) {
+          this.form.venous_pressure = Math.ceil(
+            Math.round(this.form.venous_pressure * 7.5)
+          )
+        } else if (type == 2) {
+          this.form.transmembrane_pressure = Math.ceil(
+            Math.round(this.form.transmembrane_pressure * 7.5)
+          )
+        } else {
+          this.form.arterial_pressure = Math.ceil(
+            Math.round(this.form.arterial_pressure * 7.5)
+          )
+        }
+      },
       isShow(name) {
         var filedList = store.getters.xt_user.fileds
         for (let i = 0; i < filedList.length; i++) {
@@ -677,41 +699,44 @@ export default {
 
 <style style="stylesheet/scss" lang="scss" scoped>
   .grid {
-  padding: 10px 0 20px 0;
-  .list {
-  ul {
-  @include display-flex;
-  @include align-items-center;
-  @include text-align;
-  @include justify-content-around;
-  cursor: pointer;
-  li {
-  font-size: 12px;
-  color: #5d6b7a;
-  margin-top: 20px;
-
-  p {
-  height: 30px;
-  line-height: 30px;
-  color: #34495e;
-  font-size: 14px;
-  }
-  img {
-  width: 50px;
-  height: 50px;
-  }
-  }
-  }
-  }
+    padding: 10px 0 20px 0;
+    .list {
+      ul {
+      @include display-flex;
+      @include align-items-center;
+      @include text-align;
+      @include justify-content-around;
+      cursor: pointer;
+        li {
+          font-size: 12px;
+          color: #5d6b7a;
+          margin-top: 20px;
+
+          p {
+            height: 30px;
+            line-height: 30px;
+            color: #34495e;
+            font-size: 14px;
+          }
+      img {
+            width: 50px;
+            height: 50px;
+          }
+        }
+      }
+    }
   }
   .txsj{
   text-align: center;
   margin-bottom: 20px;
   }
+  .current-box-class::-webkit-scrollbar
+  {
+      height: 20px;  /*滚动条高度*/
+  }
 </style>
 
-<
-style >
+<style style="stylesheet/scss" lang="scss">
 .dialog_box .current-box-class .current-row > td {
   background: #6fb5fa;
   color: white;
@@ -723,5 +748,9 @@ style >
   color: white;
   /* font-size: 12px; */
 }
+.el-table__body-wrapper::-webkit-scrollbar{
+  height: 20px;
+}
 </style>
 
+

src/xt_pages/dialysis/details/index.vue

@@ -1,4 +1,5 @@
 <template>
+
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
@@ -6,7 +7,12 @@
         <el-button size="small" type="primary" @click="printOrder" icon="el-icon-printer">打印</el-button>
       </div>
     </div>
-    <div class="details-bg" v-loading.fullscreen.lock="loading">
+
+    <div v-loading="loading"
+         element-loading-text="拼命加载中"
+         element-loading-spinner="el-icon-loading"
+         element-loading-background="rgba(0, 0, 0, 0.8)">
+
       <nav-igation
         ref="nav"
         title="弹窗导航"
@@ -59,21 +65,24 @@
       >
       </nav-igation>
 
+
       <basic-infor :patient="patient" :device_number="schedual.id == 0 ? '' : schedual.device_number.number"
                    :steps="steps" title="基本信息"></basic-infor>
 
 
       <dialysis-prescription :prescription="prescription" :solution="solution" :device_map="device_map"
                              title="透析处方"></dialysis-prescription>
+    </div>
 
-      <!-- <past-data class="往期数据"></past-data> -->
+    <!-- <past-data class="往期数据"></past-data> -->
       <div style="height: 20px;background-color: #f6f8f9" ></div>
       <accepts-assessment :record="receiver_treatment_access" title="接诊评估"></accepts-assessment>
 
 
       <assessment-before :record="predialysis_evaluation" ref="assessment_before" title="透前评估"></assessment-before>
 
-      <stat-order ref="stat_order" :advices="doctor_advices" :doctor_map="admin_user_map" title="临时医嘱"></stat-order>
+
+    <stat-order ref="stat_order" :advices="doctor_advices" :doctor_map="admin_user_map" title="临时医嘱"></stat-order>
 
       <dialysis-computer ref="dialysis_computer" :record="dialysis_order" :admin_map="admin_user_map"
                          :device_number_map="device_number_map" title="透析上机 "></dialysis-computer>
@@ -240,8 +249,8 @@
       <assessment-after ref="assessment_after" :record="assessment_after_dislysis" title="透后评估"></assessment-after>
 
       <treatment-of ref="treatment_of" :record="treatment_summary" title="治疗小结"></treatment-of>
+
     </div>
-  </div>
 </template>
 
 <script>
@@ -444,7 +453,6 @@
           } else {
             this.$message.error(resp.msg)
           }
-          this.loading = false
         })
 
       },assessmentAfterDislysisFunc:function(val){
@@ -520,6 +528,8 @@
             this.headNurses = headNurses
 
 
+
+
             this.niprocart_info = niprocart_info
             this.jms_info = jms_info
             this.fistula_needle_set_info = fistula_needle_set_info
@@ -588,6 +598,12 @@
             this.$message.error(resp.msg)
           }
 
+          if (this.lastDialysisPrescribe != null){
+            delete this.lastDialysisPrescribe.target_ultrafiltration
+          }
+          if (this.solution != null){
+            delete  this.solution.target_ultrafiltration
+          }
           this.loading = false
         })
       },

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -483,7 +483,7 @@
                 <td width="80">
                   <label-box :isChecked="prescription.mode_id==3?true:false" showValue='HD+HP'></label-box>
                 </td>
-                <td width="80">
+                <!-- <td width="80">
                   <label-box :isChecked="prescription.mode_id==6?true:false" showValue='SCUF'></label-box>
                 </td>
                 <td width="80">
@@ -521,7 +521,7 @@
                 </td>
                 <td width="80">
                   <label-box :isChecked="prescription.mode_id==18?true:false" showValue='HDF后置换'></label-box>
-                </td>
+                </td> -->
 
                 <td width="35">其他</td>
                 <td width="100">

src/xt_pages/role/components/AdminInfoForm.vue

@@ -19,9 +19,9 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="角色 : ">
+                <el-form-item label="角色 : " prop="role">
                     <el-select v-model="form.role" placeholder="角色">
-                        <el-option v-for="item in roles" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                        <el-option v-for="(item,index) in roles" :key="index" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
 
@@ -107,11 +107,14 @@ export default {
       },
       rules: {
         mobile: [
-          { validator: checkMobile, trigger: 'blur' }
+          { required: true,validator: checkMobile, trigger: 'blur' }
         ],
         name: [
-          { validator: checkName, trigger: 'blur' }
-        ]
+          {required: true, validator: checkName, trigger: 'blur' }
+        ],
+        role: [
+          { required: true, message: '请选择角色', trigger: 'change' }
+        ],
       }
     }
   },

src/xt_pages/role/components/EditAdminInfo.vue

@@ -20,9 +20,9 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="角色">
-                    <el-select v-model="form.role" placeholder="角色">
-                        <el-option v-for="item in roles" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                <el-form-item label="角色" prop="role">
+                    <el-select v-model="form.role" placeholder="角色" >
+                        <el-option v-for="(item,index) in roles" :key="index" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
 
@@ -54,6 +54,7 @@ export default {
     },
     data() {
         var checkMobile = (rule, value, callback) => {
+           console.log(value)
             if (!value || value.length == 0) {
                 return callback(new Error('手机号不能为空'))
             }
@@ -109,7 +110,10 @@ export default {
                 ],
                 name: [
                     {validator: checkName, trigger: 'blur'}
-                ]
+                ],
+               role: [
+                  { required: true, message: '请选择角色', trigger: 'change' }
+                ],
             }
         }
     },
@@ -125,7 +129,6 @@ export default {
             this.loading = false
             return
         }
-
         this.form.id = this.admin_id
         if (this.admin_id === 0) {
             this.form.user_type = this.user_types[0].index
@@ -134,7 +137,9 @@ export default {
                 this.loading = false
                 var resp = rs.data
                 if (resp.state === 1) {
-                    this.roles.push(...resp.data.roles)
+                  this.roles = []
+
+                  this.roles.push(...resp.data.roles)
                     this.qntoken = resp.data.qntoken
                     if (this.roles.length > 0) {
                         this.form.role = this.roles[0].id
@@ -148,15 +153,14 @@ export default {
                 this.loading = false
                 this.$message.error(err)
             })
-            
         } else {
-            getModifyAdminInitData(this.form.id).then(rs => {
+          getModifyAdminInitData(this.form.id).then(rs => {
                 this.loading = false
                 var resp = rs.data
                 if (resp.state === 1) {
-                    this.roles.push(...resp.data.roles)
+                  this.roles = []
+                  this.roles.push(...resp.data.roles)
                     this.qntoken = resp.data.qntoken
-                    
                     var admin = resp.data.admin
                     this.form.name = admin.user_name
                     this.form.mobile = admin.mobile
@@ -164,11 +168,9 @@ export default {
                     this.form.user_title = admin.user_title
                     this.form.role = admin.role_id
                     this.form.intro = admin.intro
-                    
                 } else {
                     this.$message.error(resp.msg)
                 }
-
             }).catch(err => {
                 this.loading = false
                 this.$message.error(err)
@@ -180,6 +182,12 @@ export default {
             if (this.admin_id < 0) {
                 return
             }
+            console.log(this.form)
+
+            if (this.form.role <= 0 || this.form.role == '' ){
+              this.$message.error("请选择角色")
+              return
+            }
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true
@@ -194,7 +202,7 @@ export default {
                                     _this.$store.dispatch('RecoverAdminsChangeState')
                                 }, 500)
                                 _this.$router.back(-1)
-                                
+
                             } else {
                                 this.$message.error(resp.msg)
                             }
@@ -203,7 +211,7 @@ export default {
                             this.loading = false
                             this.$message.error(err)
                         })
-                        
+
                     } else {
                         modifyAdmin(this.form.id, this.form.name, this.form.user_type, this.form.user_title, this.form.role, this.form.intro).then(rs => {
                             this.loading = false
@@ -215,7 +223,7 @@ export default {
                                     _this.$store.dispatch('RecoverAdminsChangeState')
                                 }, 500)
                                 _this.$router.back(-1)
-                                
+
                             } else {
                                 this.$message.error(resp.msg)
                             }
@@ -225,7 +233,7 @@ export default {
                             this.$message.error(err)
                         })
                     }
-                    
+
                 } else {
                     return false
                 }