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

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

@@ -21,13 +21,13 @@
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="穿刺护士"  v-if="isShowFiled('穿刺护士')">
+        <el-form-item label="穿刺者"  v-if="isShowFiled('穿刺者')">
           <el-select v-model="form.puncture_nurse_id" placeholder="请选择穿刺护士">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="冲管护士"  v-if="isShowFiled('冲管护士')">
-          <el-select v-model="form.washpipe_nurse" placeholder="请选择穿刺护士">
+          <el-select v-model="form.washpipe_nurse" placeholder="请选择冲管护士">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -17,8 +17,8 @@
         </li>
       </ul>
       <ul>
-        <li v-if="isShow('穿刺护士')">
-          <label>穿刺护士 : </label>
+        <li v-if="isShow('穿刺者')">
+          <label>穿刺者 : </label>
           <span class="content">{{ puncture_nurse }}</span>
         </li>
         <li v-if="isShow('冲管护士')">