Merge remote-tracking branch 'origin/master'

src/components/ImageUpload/index.vue

@@ -15,7 +15,8 @@
       :file-list="fileList"
       :on-preview="handlePictureCardPreview"
       :class="{hide: fileList.length >= limit
-        || $refs.imageUpload && $refs.imageUpload.uploadFiles.length >= limit}"
+        || $refs.imageUpload && $refs.imageUpload.uploadFiles.length >= limit
+        || number >= limit}"
     >
       <i class="el-icon-plus" />
     </el-upload>

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

@@ -8,7 +8,7 @@
           class="top-title-style"
         >详情</span>
       </div>
-      <div style="padding: 32px 20px 20px 20px;">
+      <div style="padding: 20px;">
         <div style="display: flex">
           <!--  文章信息 -->
           <div class="tip-green" />

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

@@ -87,7 +87,7 @@ export default {
   },
   data() {
     const weightValidator = (rule, value, callback) => {
-      if (value === 0) callback(new Error('权重为0'))
+      if (value === 0) callback(new Error('权重不能为0'))
       else callback()
     }
     return {

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

@@ -337,7 +337,7 @@ export default {
       // 表单校验
       rules: {
         articleStatus: [
-          { required: true, message: '文章状态为空', trigger: 'change' }
+          { required: true, message: '文章状态不能为空', trigger: 'change' }
         ]
       }
     }

src/views/banner_management/banner_management.vue

@@ -152,7 +152,7 @@
                       type="warning"
                       @click="deListBanner(scope.row)"
                       :disabled="scope.row.id === 1"
-                    >下架
+                    >禁用
                     </el-button>
                   </div>
                 </div>
@@ -333,13 +333,13 @@ export default {
         ...this.queryParams
       }, `banner_${new Date().getTime()}.xlsx`)
     },
-    /** 下架轮播图 */
+    /** 禁用轮播图 */
     deListBanner(row) {
       const update = {
         id: row.id,
         status: '2'
       }
-      this.$modal.confirm('是否确认下架该轮播图信息？').then(function() {
+      this.$modal.confirm('是否确认禁用该轮播图信息？').then(function() {
         updateBanner(update).then(res => {
           if (res.code === 200) {
             this.getBannerList()
@@ -348,7 +348,7 @@ export default {
         return null
       }).then(() => {
         this.getBannerList()
-        this.$modal.msgSuccess('下架成功')
+        this.$modal.msgSuccess('禁用成功')
       }).catch(() => {})
     }
   }
@@ -379,13 +379,13 @@ export default {
   color: #666666 !important;
   width: 200px !important;
 }
-/*表格上下架状态颜色样式*/
+/*表格上禁用状态颜色样式*/
 /*上架*/
 ::v-deep .status-grounding {
   color: #67C23A;
 }
 
-/*下架*/
+/*禁用*/
 ::v-deep .status-offshelf {
   color: #f5aa6c;
 }

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

@@ -411,7 +411,7 @@ export default {
           { type: 'number', validator: this.validserviceArea, trigger: 'change' }
         ],
         checkType: [
-          { required: true, message: '请选择支持检查类型', trigger: 'blur' },
+          { required: true, message: '请选择支持检查项目', trigger: 'blur' },
           { type: 'number', validator: this.validcheckType, trigger: 'change' }
         ]
       },
@@ -597,7 +597,7 @@ export default {
       if (this.form.serviceArea.length > 0) {
         callback()
       } else {
-        callback(new Error('请选择支持检查项目'))
+        callback(new Error('请选择支持服务地区'))
       }
     },
     // 支持检查类型表单校验
@@ -757,5 +757,21 @@ export default {
 ::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td .el-table__cell {
   background-color: #F6FCF5 !important;
 }
+
+//el.time-select-item.selected{
+//  color: #5FB54B;
+//  font-weight: bold;
+//}
+
+/* 修改下拉框文字样式 */
+::v-deep .el-time-select__input {
+  font-size: 16px;
+  color: #5FB54B;
+}
+
+/* 修改下拉框背景颜色 */
+::v-deep .el-picker-panel {
+  background-color: #5FB54B;
+}
 </style>
 

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

@@ -570,7 +570,7 @@
             <el-row>
               <el-col>
                 <el-form-item label="支持服务地区" prop="serviceArea">
-                  <el-select v-model="form.serviceArea" placeholder="请选择" style="width: 300px" multiple collapse-tags clearable>
+                  <el-select v-model="form.serviceArea" placeholder="请选择支持服务地区" style="width: 300px" multiple collapse-tags clearable>
                     <el-option
                       v-for="dictServiceArea in dict.type.service_area"
                       :key="dictServiceArea.label"
@@ -585,7 +585,7 @@
             <el-row>
               <el-col>
                 <el-form-item label="支持检查项目" prop="checkType">
-                  <el-select v-model="form.checkType" multiple placeholder="请选择" style="width: 300px" collapse-tags clearable>
+                  <el-select v-model="form.checkType" multiple placeholder="请选择支持检查项目" style="width: 300px" collapse-tags clearable>
                     <el-option
                       v-for="(item,index) in dict.type.exam_type"
                       :key="index.label"
@@ -715,8 +715,8 @@ export default {
           { required: true, message: '请选择设备类型', trigger: 'change' }
         ],
         selectedOptions: [
-          { required: true, message: '请选择服务地点', trigger: 'blur' },
-          { type: 'number', validator: this.validaddress, trigger: 'change' }
+          // { required: true, message: '请选择服务地点', trigger: 'blur' },
+          { required: true, type: 'number', validator: this.validaddress, trigger: 'change' }
         ],
         // addressCode: [
         //   { required: true, message: '请选择服务地点', trigger: 'change,blur' }
@@ -758,7 +758,7 @@ export default {
           { type: 'number', validator: this.validserviceArea, trigger: 'change' }
         ],
         checkType: [
-          { required: true, message: '请选择支持检查类型', trigger: 'blur' },
+          { required: true, message: '请选择支持检查项目', trigger: 'blur' },
           { type: 'number', validator: this.validcheckType, trigger: 'change' }
         ]
       },
@@ -918,7 +918,7 @@ export default {
       if (this.form.serviceArea.length > 0) {
         callback()
       } else {
-        callback(new Error('请选择支持检查项目'))
+        callback(new Error('请选择支持服务地区'))
       }
     },
     // 支持检查类型表单校验
@@ -927,7 +927,7 @@ export default {
       if (this.form.checkType.length > 0) {
         callback()
       } else {
-        callback(new Error('请选择支持服务地区'))
+        callback(new Error('请选择支持检查项目'))
       }
     },
     // 四个时间的表单校验

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

@@ -254,7 +254,7 @@
       </el-row>
       <el-row v-show="checkDetail.checkSchedule < 2">
         <el-col :span="8">
-          <el-form-item label="暂未预约">
+          <el-form-item label="暂未预约" label-width="67px">
             <span></span>
           </el-form-item>
         </el-col>
@@ -429,7 +429,7 @@ export default {
       if (price === null) {
         return null
       } else {
-        return '￥' + price.toFixed(2)
+        return price.toFixed(2)
       }
     },
     // 点击 预约信息-立即预约

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

@@ -341,7 +341,7 @@ export default {
         checkMessage.checkEndTime = row.checkDate + ' ' + checkTimeList[1]
         checkMessage.checkSchedule = '2' // 把进度改为预约检查
         checkMessage.devicePrice = this.currentPayAmount
-        console.log('需要修改的对象', checkMessage)
+        console.log('需要修改的对象-', checkMessage)
         const list = []
         list.push(checkMessage)
         updateCheck(list).then(res => {
@@ -360,7 +360,7 @@ export default {
       if (price === null) {
         return null
       } else {
-        return '￥' + price.toFixed(2)
+        return price.toFixed(2)
       }
     },
     getList() {},

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

@@ -449,7 +449,7 @@ export default {
       if (price === null) {
         return null
       } else {
-        return '￥' + price.toFixed(2)
+        return price.toFixed(2)
       }
     },
     /** 表单选择框对齐 */

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

@@ -130,13 +130,13 @@ export default {
         petStatus: ''
       },
       rules: {
-        phone: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: '请输入正确的手机号码',
-            trigger: 'blur'
-          }
-        ]
+        // phone: [
+        //   {
+        //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        //     message: '请输入正确的手机号码',
+        //     trigger: 'blur'
+        //   }
+        // ]
       },
       // 选中数据
       chooseData: {},

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

@@ -477,7 +477,7 @@ export default {
       if (price === null) {
         return '-'
       } else {
-        return '￥' + price.toFixed(2)
+        return price.toFixed(2)
       }
     },
     /** 上传报告对话框取消 */