Merge remote-tracking branch 'origin/master'

src/views/service-management/medical-record-management/check-detail.vue

@@ -274,6 +274,7 @@
             v-show="checkDetail.deviceId === null && !isPlatRole"
             v-hasPermi="['business:check:subscribe']"
             class="fourWordsBtn"
+            :disabled="currentUser.userType === '2' && currentUser.name !== checkDetail.doctorName"
             @click="bookNow"
           >立即预约</el-button>
         </div>
@@ -454,7 +455,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button class="resetBtn" @click="cancel">取消</el-button>
-        <el-button class="queryBtn" @click="centerDialogVisible">确认</el-button>
+        <el-button class="queryBtn" @click="centerDialogVisible">确定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -526,7 +527,12 @@ export default {
         reportTime: null // 报告上传时间
       },
       // 空数据(用于挂账)
-      emptyData: null
+      emptyData: null,
+      // 当前登陆用户信息
+      currentUser: {
+        userType: '',
+        name: ''
+      }
     }
   },
   created() {
@@ -535,9 +541,15 @@ export default {
       this.isPlatRole = true
     }
     this.getCheckDetail()
+    this.getCurrentUser()
   },
   methods: {
     parseTime,
+    // 获取当前登陆用户
+    getCurrentUser() {
+      this.currentUser.userType = this.$store.state.user.userType
+      this.currentUser.name = this.$store.state.user.name
+    },
     getCheckDetail() {
       const id = this.$route.query.checkId
       getManage(id).then(response => {

src/views/service-management/medical-record-management/medical-record-management.vue

@@ -235,14 +235,26 @@
           >详情
           </el-button>
           <el-button
-            v-if="!isPlatRole"
+            v-if="!isPlatRole && scope.row.deviceId !== null"
             v-hasPermi="['business:check:subscribe']"
             style="width: 80px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255, 157, 78);color: #FF9D4E;background: rgba(255,157,78,0.08);"
             size="mini"
             type="success"
             icon="el-icon-check"
             plain
-            :disabled="scope.row.deviceId !== null"
+            disabled
+            @click="handleSubscribe(scope.row)"
+          >立即预约
+          </el-button>
+          <el-button
+            v-else
+            v-hasPermi="['business:check:subscribe']"
+            style="width: 80px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255, 157, 78);color: #FF9D4E;background: rgba(255,157,78,0.08);"
+            size="mini"
+            type="success"
+            icon="el-icon-check"
+            plain
+            :disabled="currentUser.userType === '2' && currentUser.name !== scope.row.doctorName"
             @click="handleSubscribe(scope.row)"
           >立即预约
           </el-button>
@@ -504,7 +516,12 @@ export default {
       currentCheckType: null,
       updateRow: {},
       // 当前医院信息
-      currentHospital: null
+      currentHospital: null,
+      // 当前登陆用户信息
+      currentUser: {
+        userType: '',
+        name: ''
+      }
     }
   },
   created() {
@@ -512,6 +529,7 @@ export default {
       console.log('非平台权限')
       this.getList()
       this.getHospitalMessage()
+      this.getCurrentUser()
     } else {
       console.log('平台权限')
       this.getItemForPlat()
@@ -523,6 +541,11 @@ export default {
   methods: {
     moneyFormat,
     parseTime,
+    // 获取当前登陆用户
+    getCurrentUser() {
+      this.currentUser.userType = this.$store.state.user.userType
+      this.currentUser.name = this.$store.state.user.name
+    },
     /** 获取当前医院信息 */
     getHospitalMessage() {
       signHospitalMessage().then(response => {

src/views/service-management/treatment-management/treatment-detail.vue

@@ -622,7 +622,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button class="resetBtn" @click="cancelVideo">取消</el-button>
-        <el-button class="queryBtn" @click="centerDialogVisible">确认</el-button>
+        <el-button class="queryBtn" @click="centerDialogVisible">确定</el-button>
       </span>
     </el-dialog>
   </div>