Merge remote-tracking branch 'origin/master'

src/views/article-management/article-management.vue

@@ -171,10 +171,10 @@
               </div>
               <div v-if="scope.row.articleStatus==='1'">
                 <el-button
+                  :id="'removeArticle' + scope.$index"
                   key="1"
                   v-hasPermi="['business:article:remove']"
                   icon="el-icon-delete"
-                  :id="'removeArticle' + scope.$index"
                   plain
                   size="mini"
                   class="el-button--error--solid"

src/views/service-management/hospitalization-management/hospitalization-details.vue

@@ -358,7 +358,7 @@
                       <span v-else>-</span>
                     </div>
                     <div v-else>
-                      <span style="color:#5bb647 ">出院</span>
+                      <span style="color:#DB4747 ">已出院</span>
                     </div>
                   </template>
                 </el-table-column>

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

@@ -667,7 +667,7 @@ export default {
       }
       this.checkDetail.shadowReport = this.videoReport
       this.checkDetail.reportTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
-      this.checkDetail.payTime = parseTime(this.checkDetail.payTime, '{y}-{m}-{d}')
+      this.checkDetail.payTime = parseTime(this.checkDetail.payTime, '{y}-{m}-{d} {h}:{i}')
       this.checkDetail.createTime = parseTime(this.checkDetail.createTime, '{y}/{m}/{d} {h}:{i}:{s}')
       this.checkDetail.checkSchedule = '3'
       console.log('点击上传报告后', this.checkDetail)

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

@@ -197,7 +197,7 @@
           </el-row>
           <!-- 第三行:描述 -->
           <el-row :gutter="41">
-            <el-col :span="24">
+            <el-col :span="24" style="margin-left: inherit !important;">
               <el-form-item
                 :ref="'settingList.'+index+'.content'"
                 label="描述"

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

@@ -25,7 +25,7 @@
             <div>
               <!--宠物图片-->
               <div class="petPicture">
-                <ImagePreview :height="150" :src="baseURL+detailInfo.petPicture" :width="150" />
+                <ImagePreview :height="150" :src="showLogo" :width="150" />
               </div>
             </div>
           </div>
@@ -583,6 +583,7 @@ import prescribingModle from '@/views/service-management/registration-queue/comp
 import { insertDiagnosis } from '@/api/business/registration'
 import { moneyFormat } from '@/utils'
 import backBtn from '@/components/BackBtn'
+import petPic from '@/assets/images/default_pet.jpg'
 
 export default {
   name: 'RegistrationDetail',
@@ -595,6 +596,7 @@ export default {
   },
   data() {
     return {
+      defaultImage: petPic,
       submiting: false, // 提交按钮loading flag
       // 进度
       scheduleKey: { checkSchedule: '', diagnosisTime: '', registrationTime: '', reportTime: '', recipelTime: '' },
@@ -730,6 +732,17 @@ export default {
       }]
     }
   },
+  computed: {
+    /* 展示默认头像的方法 */
+    showLogo() {
+      console.log('dadada', this.detailInfo.petPicture)
+      if (this.detailInfo.petPicture) {
+        return this.baseURL + this.detailInfo.petPicture
+      } else {
+        return this.defaultImage
+      }
+    }
+  },
   created() {
     console.log('dddddddd', this.$route)
     /** 获取详情信息 */

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

@@ -170,7 +170,7 @@
           </el-row>
           <!-- 第三行:描述 -->
           <el-row :gutter="41">
-            <el-col :span="24">
+            <el-col :span="24" style="margin-left: inherit !important;">
               <el-form-item
                 :ref="'settingList.'+index+'.content'"
                 label="描述"