Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/service-management/medical-record-management/medical-record-management.vue

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

@@ -145,9 +145,9 @@ export default {
         ],
         // 文章权重判空校验
         articleWeight: [
-          { required: true, message: '请输入权重', trigger: 'change' },
-          { validator: weightValidator, trigger: 'change' },
-          { min: 1, max: 9999, type: 'number', message: '权重需要在1~9999之间', trigger: 'change' }
+          { required: true, message: '请输入权重', trigger: 'blur' },
+          { validator: weightValidator, trigger: 'blur' },
+          { min: 1, max: 9999, type: 'number', message: '权重需要在1~9999之间', trigger: 'blur' }
         ],
         // 文章封面判空校验
         articleCover: [

src/views/banner_management/banner_detail.vue

@@ -20,8 +20,7 @@
             <el-input v-model.trim="form.title" class="form-input" maxlength="20" show-word-limit clearable disabled />
           </el-form-item>
           <el-form-item label="轮播图" prop="img">
-            <ImagePreview v-if="form.img !== undefined && form.img !== null && form.img !== ''" :src="baseUrl + form.img" :width="150" :height="150" />
-            <ImagePreview v-else :src="null" :width="150" :height="150" />
+            <ImagePreview :src="baseUrl + form.img" :width="150" :height="150" />
           </el-form-item>
           <el-form-item label="跳转地址" prop="url">
             <el-input :placeholder="form.url || '-'" class="form-input" maxlength="30" show-word-limit clearable disabled />

src/views/data-statistics/echars-components/china-map.vue

@@ -89,7 +89,12 @@ export default {
           trigger: 'item', // 出发方式
           formatter: (item) => {
             const unit = _this.unit
-            const percent = (item.data.value / _this.sum * 100).toFixed(1)
+            let percent = 0
+            if (_this.sum) {
+              percent = (item.data.value / _this.sum * 100).toFixed(1)
+            } else {
+              percent = percent.toFixed(1)
+            }
             return `<div>
                 ${item.data.name}
                 <br>

src/views/data-statistics/hospital-data-statistics/hospital-data-statistics.vue

@@ -399,6 +399,7 @@ export default {
     this.getHospitalList()
     // this.justTest()
     // this.loading = true
+    // this.loading = false
   },
   methods: {
     moneyFormat,

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

@@ -2436,8 +2436,10 @@ export default {
         return '• 待缴费'
       } else if (payStatus === '1') {
         return '• 已缴费'
-      } else {
+      } else if (payStatus === '2') {
         return '• 挂账'
+      } else {
+        return '• 待缴费'
       }
     },
     // 住院情况

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

@@ -123,7 +123,11 @@
         @select-all="selectChange"
       >
         <el-table-column align="center" type="selection" width="55" />
-        <el-table-column align="left" label="序号" min-width="55" show-overflow-tooltip type="index" />
+        <el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index" >
+          <template slot-scope="scope">
+            <span>{{ scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="left" label="病历号" min-width="120" prop="medicalRecordNo" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ scope.row.medicalRecordNo || '-' }}</span>

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

@@ -85,7 +85,7 @@
         size="mini"
         @click="selectAll()"
       >
-        <svg-icon style="margin-right: 1px;" icon-class="shuaixuan_icon_quanbu" />
+        <svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_quanbu" />
         选择全部
       </el-button>
       <el-button
@@ -94,7 +94,7 @@
         size="mini"
         @click="reverseSelect()"
       >
-        <svg-icon style="margin-right: 1px;" icon-class="shuaixuan_icon_fanxiang" />
+        <svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_fanxiang" />
         反向选择
       </el-button>
       <el-button
@@ -103,7 +103,7 @@
         size="mini"
         @click="handleExport()"
       >
-        <svg-icon style="margin-right: 1px;" icon-class="shaixuan_icon_daochu" />
+        <svg-icon style="margin-right: 1px" icon-class="shaixuan_icon_daochu" />
         批量导出
       </el-button>
       <el-button
@@ -151,7 +151,13 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="检查项目" align="left" :show-overflow-tooltip="true" prop="checkItemsName" min-width="120">
+      <el-table-column
+        label="检查项目"
+        align="left"
+        :show-overflow-tooltip="true"
+        prop="checkItemsName"
+        min-width="120"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.checkItemsName || '-' }}</span>
         </template>
@@ -161,7 +167,13 @@
           <span>{{ scope.row.deviceName || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="!isPlatRole" label="宠物昵称" align="left" :show-overflow-tooltip="true" prop="petNickname" />
+      <el-table-column
+        v-if="!isPlatRole"
+        label="宠物昵称"
+        align="left"
+        :show-overflow-tooltip="true"
+        prop="petNickname"
+      />
       <el-table-column v-if="!isPlatRole" label="宠物保险" align="left" :show-overflow-tooltip="true" prop="insure">
         <template slot-scope="scope">
           <dict-tag
@@ -175,11 +187,36 @@
           <span>{{ scope.row.nickname || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="!isPlatRole" label="联系方式" align="left" :show-overflow-tooltip="true" prop="phonenumber" min-width="100" />
+      <el-table-column
+        v-if="!isPlatRole"
+        label="联系方式"
+        align="left"
+        :show-overflow-tooltip="true"
+        prop="phonenumber"
+        min-width="100"
+      />
       <el-table-column label="预约兽医" align="left" :show-overflow-tooltip="true" prop="doctorName" />
-      <el-table-column v-if="!isPlatRole" label="所属科室" align="left" :show-overflow-tooltip="true" prop="doctorDeptName" />
-      <el-table-column v-if="isPlatRole" label="所属医院" align="left" :show-overflow-tooltip="true" prop="hospitalName" />
-      <el-table-column v-if="isPlatRole" label="宠物昵称" align="left" :show-overflow-tooltip="true" prop="petNickname" />
+      <el-table-column
+        v-if="!isPlatRole"
+        label="所属科室"
+        align="left"
+        :show-overflow-tooltip="true"
+        prop="doctorDeptName"
+      />
+      <el-table-column
+        v-if="isPlatRole"
+        label="所属医院"
+        align="left"
+        :show-overflow-tooltip="true"
+        prop="hospitalName"
+      />
+      <el-table-column
+        v-if="isPlatRole"
+        label="宠物昵称"
+        align="left"
+        :show-overflow-tooltip="true"
+        prop="petNickname"
+      />
       <el-table-column v-if="isPlatRole" label="宠物保险" align="left" :show-overflow-tooltip="true" prop="insure">
         <template slot-scope="scope">
           <dict-tag
@@ -193,7 +230,14 @@
           <span>{{ scope.row.nickname || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="isPlatRole" label="联系方式" align="left" :show-overflow-tooltip="true" prop="phonenumber" min-width="100" />
+      <el-table-column
+        v-if="isPlatRole"
+        label="联系方式"
+        align="left"
+        :show-overflow-tooltip="true"
+        prop="phonenumber"
+        min-width="100"
+      />
       <el-table-column v-if="!isPlatRole" label="缴费状态" align="left" :show-overflow-tooltip="true" prop="payType">
         <template slot-scope="scope">
           <dict-tag
@@ -202,7 +246,13 @@
           />
         </template>
       </el-table-column>
-      <el-table-column v-if="!isPlatRole" label="预约状态" align="left" :show-overflow-tooltip="true" prop="checkSchedule">
+      <el-table-column
+        v-if="!isPlatRole"
+        label="预约状态"
+        align="left"
+        :show-overflow-tooltip="true"
+        prop="checkSchedule"
+      >
         <template slot-scope="scope">
           <span v-show="scope.row.checkSchedule < 2" style="color: #FF9D4E">待预约</span>
           <span v-show="scope.row.checkSchedule >= 2" style="color: #67C23A">已预约</span>
@@ -223,7 +273,11 @@
       <el-table-column label="检查时段" align="left" :show-overflow-tooltip="true" prop="checkStartTime" min-width="90">
         <template slot-scope="scope">
           <span v-if="scope.row.checkStartTime === null && scope.row.checkEndTime === null">{{ '-' }}</span>
-          <span v-else>{{ parseTime(scope.row.checkStartTime, '{h}:{i}') + '~' + parseTime(scope.row.checkEndTime, '{h}:{i}') || '-' }}</span>
+          <span
+            v-else
+          >{{
+            parseTime(scope.row.checkStartTime, '{h}:{i}') + '~' + parseTime(scope.row.checkEndTime, '{h}:{i}') || '-'
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="left" class-name="small-padding fixed-width" min-width="146">
@@ -323,7 +377,9 @@
           </el-col>
           <el-col v-show="currentCheckType === '2'" :span="6">
             <el-form-item label="预储值余额" prop="shadowReport" label-width="120">
-              <span v-if="currentHospital !== undefined && currentHospital !== null">{{ moneyFormat(currentHospital.currentBalance || 0.00) + ' 元' }}</span>
+              <span
+                v-if="currentHospital !== undefined && currentHospital !== null"
+              >{{ moneyFormat(currentHospital.currentBalance || 0.00) + ' 元' }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -991,6 +1047,7 @@ export default {
 ::v-deep .el-dialog:not(.is-fullscreen) {
   margin-top: 12vh !important;
 }
+
 .dialog-class {
   height: 500px;
   overflow-y: auto;

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

@@ -94,7 +94,7 @@
               class="fourWordswhiteBtn"
               size="mini"
               @click="checkAll"
-            ><svg-icon style="margin-right: 5px" icon-class="shuaixuan_icon_quanbu" />选择全部
+            ><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_quanbu" />选择全部
             </el-button>
             <!--反向选择-->
             <el-button
@@ -102,7 +102,7 @@
               class="fourWordswhiteBtn"
               size="mini"
               @click="reverseSelection"
-            >  <svg-icon icon-class="shuaixuan_icon_fanxiang" />反向选择
+            >  <svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_fanxiang" />反向选择
             </el-button>
             <!--批量导出-->
             <el-button
@@ -110,7 +110,7 @@
               class="fourWordswhiteBtn"
               size="mini"
               @click="handleExport"
-            ><svg-icon style="margin-right: 5px" icon-class="shaixuan_icon_daochu" />批量导出
+            ><svg-icon style="margin-right: 1px" icon-class="shaixuan_icon_daochu" />批量导出
             </el-button>
           </el-form-item>
           <el-form-item class="right-btns">
@@ -129,7 +129,11 @@
         @select-all="selectChange"
       >
         <el-table-column align="center" type="selection" width="55" />
-        <el-table-column align="left" label="序号" min-width="55" prop="index" show-overflow-tooltip type="index" />
+        <el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index" >
+          <template slot-scope="scope">
+            <span>{{ scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="left" label="挂号方式" min-width="70" prop="type" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ scope.row.type === '1' ? '现场' : '预约' }}</span>