Merge remote-tracking branch 'origin/master'

src/views/equipment-management/use-management/use-management.vue

@@ -88,7 +88,7 @@
       </el-col>
     </el-row>
 
-    <el-table ref="table" v-loading="loading" :data="userList" :row-key="getRowKeys"  :header-cell-style="{background:'#E8E9E8'}" @selection-change="handleSelectionChange">
+    <el-table ref="table" v-loading="loading" :data="userList" :row-key="getRowKeys"  :header-cell-style="{background:'#F4F4F4'}" @selection-change="handleSelectionChange">
       <el-table-column type="selection" min-width="50" align="center" :reserve-selection="true" />
       <el-table-column type="index" label="序号" min-width="60" />
       <el-table-column label="设备名称" align="left" prop="deviceName" min-width="80" :show-overflow-tooltip="true">

src/views/service-management/registration-queue/registration-queue.vue

@@ -196,6 +196,7 @@
               plain
               size="mini"
               style="width: 70px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);"
+              :disabled="scope.row.isAdd === '1'"
               type="warning"
               @click="handleDetail(scope.row, 'enter')"
             >录入诊断