Merge remote-tracking branch 'origin/master'

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

@@ -626,10 +626,11 @@ color: #333333;"
                     v-if="isEdit && scope.row.paymentStatus === '0' && !scope.row.inputShow"
                     icon="el-icon-document"
                     plain
+                    id="remove-medication"
                     size="mini"
                     style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(155,0,65);"
                     type="danger"
-                    @click="handleDelRow(scope.row, 'stockDispenseOutboundList')"
+                    @click="handleDelRow(scope.row, 'stockDispenseOutboundList', 'remove-medication')"
                   >删除
                   </el-button>
                 </template>
@@ -816,12 +817,13 @@ color: #333333;"
                   </el-button>
                   <el-button
                     v-if="isEdit && scope.row.payType === '0' && !scope.row.inputShow"
+                    id="remove-check"
                     icon="el-icon-document"
                     plain
                     size="mini"
                     style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(155,0,65);"
                     type="danger"
-                    @click="handleDelRow(scope.row, 'checkManageBos')"
+                    @click="handleDelRow(scope.row, 'checkManageBos', 'remove-check')"
                   >删除
                   </el-button>
                 </template>
@@ -964,11 +966,12 @@ color: #333333;"
                   <el-button
                     v-if="isEdit && scope.row.payType === '0' && !scope.row.inputShow"
                     icon="el-icon-document"
+                    id="remove-therapy"
                     plain
                     size="mini"
                     style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(155,0,65);"
                     type="danger"
-                    @click="handleDelRow(scope.row, 'treatManageBo')"
+                    @click="handleDelRow(scope.row, 'treatManageBo', 'remove-therapy')"
                   >删除
                   </el-button>
                 </template>
@@ -1110,10 +1113,11 @@ color: #333333;"
                     v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow && (scope.row.status === '1' || scope.row.status === '2')"
                     icon="el-icon-document"
                     plain
+                    id="remove-hospitalized"
                     size="mini"
                     class="el-button--error--solid"
                     type="danger"
-                    @click="delPetInHospital(scope.row)"
+                    @click="delPetInHospital(scope.row, 'remove-hospitalized')"
                   >删除
                   </el-button>
                 </template>
@@ -1874,7 +1878,7 @@ export default {
       }
     },
     /** 删除行*/
-    handleDelRow(rowData, tableName) {
+    handleDelRow(rowData, tableName, removeButtonId) {
       // 删除信息行
       this.$confirm('是否确认删除此条数据，删除后不可恢复', '删除', {
         confirmButtonText: '确定',
@@ -1912,6 +1916,8 @@ export default {
           })
         }
       }).catch(() => {
+        /* 最后给特定的id进行设置 */
+        document.getElementById(removeButtonId).blur()
       })
     },
     /** 新增行*/
@@ -2177,7 +2183,7 @@ export default {
       })
     },
     /** 删除病历住院信息 */
-    delPetInHospital(row) {
+    delPetInHospital(row, removeButtonId) {
       this.$confirm('是否确认删除此条数据，删除后不可恢复', '删除', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -2192,6 +2198,9 @@ export default {
             this.getInHospitalList(this.$route.params.id)
           }
         })
+      }).catch(() => {
+        /* 最后给特定的id进行设置 */
+        document.getElementById(removeButtonId).blur()
       })
     },
     /** 获取费用明细 */

src/views/service-management/registration-queue/components/choose-pet.vue

@@ -57,8 +57,8 @@
       row-key="id"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column align="center" min-width="30" reserve-selection type="selection"/>
-      <el-table-column label="序号" min-width="80" show-overflow-tooltip type="index"/>
+      <el-table-column align="center" min-width="30" reserve-selection type="selection" />
+      <el-table-column label="序号" min-width="80" show-overflow-tooltip type="index" />
       <el-table-column label="宠主姓名" min-width="80" prop="ownerName" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.ownerName || '-' }}</span>
@@ -102,9 +102,7 @@
       </el-table-column>
       <el-table-column label="宠物性别" min-width="60" prop="petSex" show-overflow-tooltip>
         <template slot-scope="scope">
-          <i v-if="scope.row.petSex === '1'" class="el-icon-male"/>
-          <i v-else-if="scope.row.petSex === '2'" class="el-icon-female"/>
-          <div v-else>待定</div>
+          <dict-tag :options="dict.type.pet_sex" :value="scope.row.petSex" />
         </template>
       </el-table-column>
     </el-table>
@@ -338,10 +336,9 @@ export default {
       }
     }
   }
-
-  ::v-deep th {
+  ::v-deep th{
     .cell {
-      .el-checkbox {
+      .el-checkbox{
         display: none;
       }
     }