Merge remote-tracking branch 'origin/master'

src/components/BackBtn/index.vue

+<template>
+  <el-button :loading="loading" :class="buttonClass" :icon="buttonIcon" @click="clickEvent">{{ buttonText }}</el-button>
+</template>
+
+<script>
+export default {
+  name: 'Index',
+  props: {
+    buttonClass: {
+      type: String,
+      default: 'resetBtn'
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    buttonIcon: {
+      type: String,
+      default: 'el-icon-back'
+    },
+    buttonText: {
+      type: String,
+      default: '返 回'
+    },
+    clickAction: {
+      type: Object,
+      required: true
+    },
+    isShowConfirm: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    clickEvent() {
+      if (this.isShowConfirm) {
+        this.$confirm(this.buttonClass === 'queryBtn' ? '系统即将发布编辑内容，是否确定' : '是否立即返回，返回后系统不再保存已填写内容', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          customClass: 'box-logout',
+          cancelButtonClass: 'resetBtn',
+          confirmButtonClass: 'queryBtn',
+          type: 'warning',
+          closeOnClickModal: false
+        }).then(() => {
+          this.clickAction()
+        })
+      } else {
+        this.clickAction()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/ImageUpload/index.vue

@@ -42,7 +42,7 @@
           <div
             slot="error"
             class="image-slot"
-            style="width: 100%;height: 100%; border: 1px solid #DB4747;border-radius:1px;"
+            style="width: 100%;height: 100%; border: 1px #DB4747;border-radius:5px;"
           >
             <div class="parent-container">
               <img

src/router/index.js

@@ -120,10 +120,10 @@ export const constantRoutes = [
 
       },
       {
-        path: 'equipment-detail',
+        path: 'equipment-edit',
         props: true,
         component: () => import('@/views/equipment-management/equipment-management/equipment-detail'),
-        name: 'EquipmentDetail',
+        name: 'EquipmentEdit',
         meta: { title: '设备详情' }
       },
       {
@@ -131,7 +131,7 @@ export const constantRoutes = [
         props: true,
         component: () => import('@/views/equipment-management/equipment-management/equipment-detail'),
         name: 'EquipmentEdit',
-        meta: { title: '设备详情' }
+        meta: { title: '设备編輯' }
       },
       {
         path: 'equipment-add',

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

@@ -605,7 +605,7 @@ export default {
     /** 跳转到详情页*/
     detailsDevice(id) {
       this.$router.push({
-        name: 'EquipmentDetail',
+        name: 'EquipmentEdit',
         query: {
           identify: '2',
           id: id

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

@@ -545,16 +545,21 @@
             />
           </div>
           <!--底部返回按钮-->
-          <el-button
+          <back-btn
             v-if="$route.params.type === 'enter'"
             :loading="submiting"
-            class="queryBtn"
-            icon="el-icon-check"
-            @click="submitForm"
-          >提
-            交
-          </el-button>
-          <el-button class="backBth" icon="el-icon-back" @click="goBack">返 回</el-button>
+            :button-class="'queryBtn'"
+            :button-icon="'el-icon-check'"
+            :click-action="submitForm"
+            button-text="提 交"
+            :is-show-confirm="$route.params.type === 'enter'"
+          />
+          <back-btn
+            button-text="返 回"
+            button-class="resetBtn"
+            :click-action="goBack"
+            :is-show-confirm="$route.params.type === 'enter'"
+          />
         </el-form>
       </div>
     </div>
@@ -570,6 +575,7 @@ import scheduleInfo from '@/views/service-management/registration-queue/componen
 import prescribingModle from '@/views/service-management/registration-queue/components/prescribing-modle'
 import { insertDiagnosis } from '@/api/business/registration'
 import { moneyFormat } from '@/utils'
+import backBtn from '@/components/BackBtn'
 
 export default {
   name: 'RegistrationDetail',
@@ -577,7 +583,8 @@ export default {
   dicts: ['pet_sex', 'vaccine_situation', 'exist_state', 'sterilization_status', 'pet_insure', 'cat_breed', 'dog_breed', 'other_breed'],
   components: {
     scheduleInfo,
-    prescribingModle
+    prescribingModle,
+    backBtn
   },
   data() {
     return {