Merge remote-tracking branch 'origin/master'

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

src/components/ImageUpload/index.vue

@@ -38,6 +38,7 @@
       <img
         :src="dialogImageUrl"
         style="display: block; max-width: 100%; margin: 0 auto"
+        alt=""
       >
     </el-dialog>
   </div>
@@ -224,5 +225,9 @@ export default {
     opacity: 0;
     transform: translateY(0);
 }
+::v-deep .el-upload:focus {
+  border-color: #5FB54B !important;
+  color: #5FB54B !important;
+}
 </style>
 

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

@@ -109,7 +109,7 @@
             ref="table"
             v-loading="loading"
             :data="articleList"
-            :header-cell-style="{background:'#E8E9E8'}"
+            :header-cell-style="{background:'#e5e5e5'}"
             row-key="id"
             @selection-change="handleSelectionChange"
           >

src/views/banner_management/banner_add.vue

@@ -11,21 +11,23 @@
       <div>
         <el-form ref="form" :model="form" label-width="133px" :rules="rules">
           <el-form-item label="标题：" prop="title">
-            <el-input v-model.trim="form.title" class="form-input" style="width: 420px" maxlength="20" show-word-limit clearable />
+            <el-input v-model.trim="form.title" class="form-input" style="width: 420px" maxlength="12" show-word-limit clearable />
           </el-form-item>
           <el-form-item label="轮播图：" prop="img">
-            <image-upload v-model="form.img" :limit="1" :is-show-tip="false" />
+            <image-upload v-model="form.img" :limit="1" :is-show-tip="false" file-size="20" />
           </el-form-item>
           <el-form-item label="跳转地址：" prop="url">
-            <el-input v-model.trim="form.url" class="form-input" style="width: 420px" maxlength="30" show-word-limit clearable />
+            <el-input v-model.trim="form.url" class="form-input" style="width: 420px" maxlength="255" show-word-limit clearable />
           </el-form-item>
           <el-form-item label="权重：" prop="sort">
             <el-input-number
-              v-model="form.sort"
+              v-model.number="form.sort"
               class="weight-number"
               :max="9999"
               :min="0"
               controls-position="right"
+              :precision="0"
+              @blur="form.sort === undefined || form.sort === null ? form.sort = 0:form.sort"
             />
           </el-form-item>
           <el-form-item label="创建日期：" prop="createTime">
@@ -68,6 +70,9 @@ export default {
       const search = {
         sort: value
       }
+      if (value === 0) {
+        return callback(new Error('权重不能为零'))
+      }
       // 调用后端api
       listBanner(search).then(Response => {
         if (Response.code === 200) {
@@ -78,6 +83,15 @@ export default {
         }
       })
     }
+    const titleTest = (rule, value, callback) => {
+      // const title= /^[\u0391-\uFFE5A-Za-z]+$/
+      const title = /^[\a-\z\A-\Z0-9\u4e00-\u9fe5]+$/
+      if (!title.test(value)) {
+        callback(new Error('请输入中英文数字'))
+      } else {
+        callback()
+      }
+    }
     return {
       // 表单数据
       form: {
@@ -92,16 +106,18 @@ export default {
       submitLoading: false,
       rules: {
         title: [
-          { required: true, message: '请输入轮播标题', trigger: 'blur' }
+          { required: true, message: '请输入标题', trigger: 'blur' },
+          { validator: titleTest, trigger: 'blur' }
         ],
         img: [
-          { required: false, message: '请选择轮播图', trigger: 'blur' }
+          { required: false, message: '请选择轮播图', trigger: 'change' }
         ],
         url: [
-          { required: true, message: '请输入跳转地址', trigger: 'blur' }
+          { required: false, message: '请输入跳转地址', trigger: 'blur' }
         ],
         sort: [
           { required: true, message: '请输入权重', trigger: 'blur' },
+          { validator: checkSort, trigger: 'blur' },
           { validator: checkSort, trigger: 'change' }
         ],
         status: [
@@ -113,9 +129,22 @@ export default {
       }
     }
   },
-  watch: {},
+  watch: {
+    'form.status'(newVal) {
+      if (newVal === '1') {
+        this.rules.img[0].required = true
+      } else {
+        this.rules.img[0].required = false
+      }
+    }
+  },
   created() {
     this.getNowDate()
+    if (this.form.status === '1') {
+      this.rules.img[0].required = true
+    } else {
+      this.rules.img[0].required = false
+    }
   },
   methods: {
     // 获取当前日期

src/views/banner_management/banner_detail.vue

@@ -14,7 +14,7 @@
             <el-input v-model.trim="form.title" class="form-input" style="width: 420px" maxlength="20" show-word-limit clearable disabled />
           </el-form-item>
           <el-form-item label="轮播图：" prop="img">
-            <el-image :src="baseUrl + form.img" class="formImg" :preview-src-list="srcList" />
+            <ImagePreview :height="100" :src="baseUrl + form.img" :width="100" />
           </el-form-item>
           <el-form-item label="跳转地址：" prop="url">
             <el-input v-model.trim="form.url" class="form-input" style="width: 420px" maxlength="30" show-word-limit clearable disabled />

src/views/banner_management/banner_edit.vue

@@ -11,22 +11,24 @@
       <div>
         <el-form ref="form" :model="form" label-width="133px" :rules="rules">
           <el-form-item label="标题：" prop="title">
-            <el-input v-model.trim="form.title" class="form-input" style="width: 420px" maxlength="20" show-word-limit clearable :disabled="form.id === 1" />
+            <el-input v-model.trim="form.title" class="form-input" style="width: 420px" maxlength="12" show-word-limit clearable :disabled="form.id === 1" />
           </el-form-item>
           <el-form-item label="轮播图：" prop="img">
-            <image-upload v-model="form.img" :limit="1" :is-show-tip="false" />
+            <image-upload v-model="form.img" :limit="1" :is-show-tip="false" file-size="20" />
           </el-form-item>
           <el-form-item label="跳转地址：" prop="url">
-            <el-input v-model.trim="form.url" class="form-input" style="width: 420px" maxlength="30" show-word-limit clearable :disabled="form.id === 1" />
+            <el-input v-model.trim="form.url" class="form-input" style="width: 420px" maxlength="255" show-word-limit clearable :disabled="form.id === 1" />
           </el-form-item>
           <el-form-item label="权重：" prop="sort">
             <el-input-number
-              v-model="form.sort"
+              v-model.number="form.sort"
               class="weight-number"
               :max="9999"
               :min="0"
               controls-position="right"
               :disabled="form.id === 1"
+              :precision="0"
+              @blur="form.sort === undefined || form.sort === null ? form.sort = 0:form.sort"
             />
           </el-form-item>
           <el-form-item label="创建日期：" prop="createTime">
@@ -47,7 +49,7 @@
             </span>
           </el-form-item>
           <el-form-item label="备注：" prop="notes">
-            <el-input :disabled="form.id === 1" v-model.trim="form.notes" class="form-input" style="width: 420px" maxlength="60" show-word-limit clearable />
+            <el-input v-model.trim="form.notes" :disabled="form.id === 1" class="form-input" style="width: 420px" maxlength="60" show-word-limit clearable />
           </el-form-item>
           <el-form-item>
             <el-button :loading="submitLoading" class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
@@ -65,8 +67,10 @@ export default {
   name: 'BannerEdit',
   data() {
     const checkSort = (rule, value, callback) => {
-      if (!value) {
+      if (value === undefined || value === null) {
         return callback(new Error('请输入权重'))
+      } else if (value === 0) {
+        return callback(new Error('权重不能为零'))
       } else {
         const search = {
           exceptId: this.id,
@@ -83,6 +87,15 @@ export default {
         })
       }
     }
+    const titleTest = (rule, value, callback) => {
+      // const title= /^[\u0391-\uFFE5A-Za-z]+$/
+      const title = /^[\a-\z\A-\Z0-9\u4e00-\u9fe5]+$/
+      if (!title.test(value)) {
+        callback(new Error('请输入中英文数字'))
+      } else {
+        callback()
+      }
+    }
     return {
       id: undefined,
       // 表单数据
@@ -98,16 +111,18 @@ export default {
       submitLoading: false,
       rules: {
         title: [
-          { required: true, message: '请输入轮播标题', trigger: 'blur' }
+          { required: true, message: '请输入标题', trigger: 'blur' },
+          { validator: titleTest, trigger: 'blur' }
         ],
         img: [
-          { required: false, message: '请选择轮播图', trigger: 'blur' }
+          { required: false, message: '请选择轮播图', trigger: 'change' }
         ],
         url: [
-          { required: true, message: '请输入跳转地址', trigger: 'blur' }
+          { required: false, message: '请输入跳转地址', trigger: 'blur' }
         ],
         sort: [
-          { required: false, message: '请输入权重', trigger: 'blur' },
+          { required: true, message: '请输入权重', trigger: 'blur' },
+          { validator: checkSort, trigger: 'blur' },
           { validator: checkSort, trigger: 'change' }
         ],
         status: [
@@ -119,7 +134,15 @@ export default {
       }
     }
   },
-  watch: {},
+  watch: {
+    'form.status'(newVal) {
+      if (newVal === '1') {
+        this.rules.img[0].required = true
+      } else {
+        this.rules.img[0].required = false
+      }
+    }
+  },
   created() {
     this.id = this.$route.query.id
     if (this.id) {
@@ -133,6 +156,11 @@ export default {
         if (res.code === 200) {
           console.log('轮播信息', res)
           this.form = res.data
+          if (this.form.status === '1') {
+            this.rules.img[0].required = true
+          } else {
+            this.rules.img[0].required = false
+          }
         }
       })
     },
@@ -142,16 +170,27 @@ export default {
       this.$refs['form'].validate(valid => {
         if (valid) {
           console.log('校验通过')
-          this.submitLoading = true
-          updateBanner(this.form).then(res => {
-            if (res.code === 200) {
-              this.submitLoading = false
-              this.$message({
-                message: '修改成功！',
-                type: 'success'
-              })
-              this.goBack()
-            }
+
+          this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            customClass: 'box-logout',
+            cancelButtonClass: 'resetBtn',
+            confirmButtonClass: 'queryBtn',
+            type: 'warning',
+            closeOnClickModal: false
+          }).then(() => {
+            this.submitLoading = true
+            updateBanner(this.form).then(res => {
+              if (res.code === 200) {
+                this.submitLoading = false
+                this.$message({
+                  message: '修改成功！',
+                  type: 'success'
+                })
+                this.goBack()
+              }
+            })
           })
         }
       })

src/views/banner_management/banner_management.vue

@@ -240,11 +240,11 @@ export default {
     /** 查询轮播图管理列表 */
     getBannerList() {
       this.loading = true
-      console.log('查询条件', this.queryParams)
       listBanner(this.queryParams).then(response => {
         this.bannerList = response.rows
         this.total = response.total
         this.loading = false
+        console.log('查询res', this.bannerList)
       })
     },
     // 取消按钮
@@ -320,12 +320,24 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids
-      this.$modal.confirm('是否确认删除该轮播图信息？').then(function() {
-        return delBanner(ids)
+
+      this.$confirm('是否确认删除此条数据，删除后不可恢复', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        customClass: 'box-logout',
+        cancelButtonClass: 'resetBtn',
+        confirmButtonClass: 'queryBtn',
+        type: 'warning',
+        closeOnClickModal: false
       }).then(() => {
-        this.getBannerList()
-        this.$modal.msgSuccess('删除成功')
-      }).catch(() => {})
+        this.submitLoading = true
+        delBanner(ids).then(res => {
+          if (res.code === 200) {
+            this.getBannerList()
+            this.$modal.msgSuccess('删除成功')
+          }
+        })
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -339,17 +351,11 @@ export default {
         id: row.id,
         status: '2'
       }
-      this.$modal.confirm('是否确认禁用该轮播图信息？').then(function() {
-        updateBanner(update).then(res => {
-          if (res.code === 200) {
-            this.getBannerList()
-          }
-        })
-        return null
-      }).then(() => {
-        this.getBannerList()
-        this.$modal.msgSuccess('禁用成功')
-      }).catch(() => {})
+      updateBanner(update).then(res => {
+        if (res.code === 200) {
+          this.getBannerList()
+        }
+      })
     }
   }
 }

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

@@ -14,7 +14,7 @@
           <el-option
             v-for="(item,index) in checkList"
             :key="index"
-            :label="item.dictName"
+            :label="item.name"
             :value="item.id"
           />
         </el-select>
@@ -88,7 +88,7 @@
       </el-col>
     </el-row>
 
-    <el-table ref="table" v-loading="loading" :data="userList" :row-key="getRowKeys"  :header-cell-style="{background:'#E8E9E8'}" @selection-change="handleSelectionChange">
+    <el-table ref="table" v-loading="loading" :data="userList" :row-key="getRowKeys"  :header-cell-style="{background:'#F4F4F4'}" @selection-change="handleSelectionChange">
       <el-table-column type="selection" min-width="50" align="center" :reserve-selection="true" />
       <el-table-column type="index" label="序号" min-width="60" />
       <el-table-column label="设备名称" align="left" prop="deviceName" min-width="80" :show-overflow-tooltip="true">
@@ -244,7 +244,7 @@ export default {
       // 模糊查询
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         isAsc: 'desc',
         orderByColumn: 'c.report_time',
         searchText: '',
@@ -286,6 +286,7 @@ export default {
     // 检查项目下拉框
     getCheckList() {
       selectCheckItem().then(res => {
+        console.log('检查项目', res)
         this.checkList = res
       })
     },
@@ -300,7 +301,7 @@ export default {
       this.sortedColumn = ''
       this.queryParams = {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         isAsc: 'desc',
         orderByColumn: 'c.report_time',
         searchText: '',
@@ -332,7 +333,7 @@ export default {
       if (this.ids.length !== 0) {
         const exportTable = {}
         exportTable.useIds = this.ids
-        this.download('business/check/exportUse', exportTable, `使用管理_${this.exportFormatTime(new Date())}.xlsx`).then(res => {
+        this.download('business/check/exportUse', exportTable, `使用管理-${this.exportFormatTime(new Date())}.xlsx`).then(res => {
           this.$refs.table.clearSelection()
         })
       } else {

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

@@ -445,7 +445,7 @@ color: #333333;"
         <!-- 内部信息 -->
         <div class="table-content">
           <el-form ref="drugForm" :model="drugForm" :rules="drugRules" class="demo-ruleForm" label-width="0">
-            <el-table :data="petProtect" :header-cell-style="{ background:'#E8E9E8'}" border>
+            <el-table :data="petProtect" :header-cell-style="{ background:'#e5e5e5'}" border>
               <el-table-column align="center" label="药品名称" prop="protectName">
                 <template slot-scope="scope">
                   <el-form-item
@@ -560,7 +560,7 @@ color: #333333;"
             <el-table
               :data="checkManageBos"
               class="check-manage-bos__table"
-              :header-cell-style="{ background:'#E8E9E8'}"
+              :header-cell-style="{ background:'#e5e5e5'}"
               border
             >
               <el-table-column align="center" label="检查类型" prop="checkType">
@@ -739,7 +739,7 @@ color: #333333;"
             <el-table
               :data="treatManageBo"
               class="treat-manage-bo__table"
-              :header-cell-style="{ background:'#E8E9E8'}"
+              :header-cell-style="{ background:'#e5e5e5'}"
               border
             >
               <el-table-column align="center" label="治疗项目" prop="treatItemsName">
@@ -868,7 +868,7 @@ color: #333333;"
         </div>
         <!-- 内部信息 -->
         <div class="table-content">
-          <el-table :data="petProtect" :header-cell-style="{ background:'#E8E9E8'}" border>
+          <el-table :data="petProtect" :header-cell-style="{ background:'#e5e5e5'}" border>
             <el-table-column align="center" label="入院日期" prop="protectName" />
             <el-table-column align="center" label="住院天数" prop="type" />
             <el-table-column align="center" label="病情等级" prop="date" />
@@ -930,7 +930,7 @@ color: #333333;"
         </div>
         <!-- 内部信息 -->
         <div class="table-content">
-          <el-table :data="petProtect" :header-cell-style="{ background:'#E8E9E8'}" border>
+          <el-table :data="petProtect" :header-cell-style="{ background:'#e5e5e5'}" border>
             <el-table-column align="center" label="收费项" prop="protectName" />
             <el-table-column align="center" label="明细" prop="type" />
             <el-table-column align="center" label="数目" prop="date" />

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

@@ -114,7 +114,7 @@
         ref="table"
         v-loading="loading"
         :data="recordList"
-        :header-cell-style="{background:'#E8E9E8'}"
+        :header-cell-style="{background:'#e5e5e5'}"
         @select="selectChange"
         @selection-change="handleSelectionChange"
       >

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

@@ -200,8 +200,8 @@
             type="success"
             icon="el-icon-check"
             plain
-            @click="handleSubscribe(scope.row)"
             :disabled="scope.row.deviceId !== null"
+            @click="handleSubscribe(scope.row)"
           >立即预约
           </el-button>
         </template>
@@ -258,7 +258,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="7" v-show="currentCheckType === '2'">
+          <el-col v-show="currentCheckType === '2'" :span="7">
             <el-form-item label="支出账户金额" prop="shadowReport" label-width="120">
               1200.00
             </el-form-item>

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

@@ -40,7 +40,7 @@
       ref="table"
       v-loading="loading"
       :data="petsList"
-      :header-cell-style="{background:'#E8E9E8'}"
+      :header-cell-style="{background:'#e5e5e5'}"
       border
       :header-cell-class-name="cellClass"
       row-key="id"

src/views/service-management/registration-queue/components/register-modle.vue

@@ -34,7 +34,7 @@
       ref="table"
       :data="petsList"
       :header-cell-class-name="cellClass"
-      :header-cell-style="{background:'#E8E9E8'}"
+      :header-cell-style="{background:'#e5e5e5'}"
       border
       row-key="id"
       @selection-change="handleSelectionChange"

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

@@ -119,7 +119,7 @@
       <el-table
         ref="table"
         v-loading="loading"
-        :header-cell-style="{background:'#E8E9E8'}"
+        :header-cell-style="{background:'#e5e5e5'}"
         :data="registerList"
         @select="selectChange"
         @selection-change="handleSelectionChange"
@@ -196,6 +196,7 @@
               plain
               size="mini"
               style="width: 70px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);"
+              :disabled="scope.row.isAdd === '1'"
               type="warning"
               @click="handleDetail(scope.row, 'enter')"
             >录入诊断