Merge remote-tracking branch 'origin/master'

src/api/business/item.js

@@ -8,7 +8,14 @@ export function listItem(query) {
     params: query
   })
 }
-
+// 查询平台项目管理列表
+export function listPlatformItem(query) {
+  return request({
+    url: '/business/item/platformList',
+    method: 'get',
+    params: query
+  })
+}
 // 根据检查类型(医院自有服务、预约外部服务)查询检查项目
 export function listItemByType(query) {
   return request({

src/assets/styles/element-ui.scss

@@ -443,9 +443,15 @@ input::-webkit-input-placeholder {
   cursor: pointer;
 }
 .el-input-number .el-input input {
-  text-align: center;
+  text-align: left;
 }
 .el-cascader{
   color: #5FB54B;
+}.el-checkbox__inner{
+  height: 14px;
+  width: 14px;
+ }
+// 调整复选框样式
+.el-table .disabledCheck .cell .el-checkbox__inner {
+  margin-right: 3px;
 }
-

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

@@ -33,9 +33,9 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item v-if="hpshow" label="医院自有设备" prop="deviceName">
+                <el-form-item v-if="hpshow" label="医院自有设备">
 
-                  <el-select v-model="form.isPrivate" style="width: 250px" placeholder="请选择医院自有设备">
+                  <el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择医院自有设备">
                     <el-option
                       v-for="(item ,index) in optionss"
                       :key="index"
@@ -74,7 +74,7 @@
             </el-row>
             <!--                        3-->
             <el-row>
-              <el-col :span="8">
+              <el-col :span="16">
                 <el-form-item label="服务地点" prop="selectedOptions">
                   <el-cascader
                     v-model="form.selectedOptions"
@@ -87,19 +87,20 @@
                     @change="handleChangeAddress"
                   />
                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item prop="address" style="margin-left: 11%">
+
+                <el-form-item prop="address">
                   <el-input
                     v-model.trim="form.address"
-                    placeholder="请输入服务地址"
+                    placeholder="请输入详细地址地址(街道、楼牌号等)"
                     maxlength="40"
                     clearable
-                  >
-                    <template v-if="addtions.names !== ''" slot="prepend">{{ addtions.names }}</template>
-                  </el-input>
+                    style="width: 400px"
+                  />
                 </el-form-item>
               </el-col>
+              <!--              <el-col :span="8">-->
+              <!--              -->
+              <!--              </el-col>-->
               <el-col :span="8">
                 <el-form-item label="单位时段服务数" prop="useNum">
                   <el-input-number
@@ -290,7 +291,10 @@
           </el-form>
           <el-row>
             <el-col style="display: flex;justify-content: center;margin-top: 20px">
-              <el-button class="queryBtn" type="primary" size="mini" icon="el-icon-check" @click="submitForm">提交</el-button>
+              <el-button class="queryBtn" type="primary" size="mini" icon="el-icon-check" @click="submitForm" :disabled="loading">
+                <span v-if="!loading">提交</span>
+                <span v-else>提交...</span>
+              </el-button>
               <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返 回</el-button>
             </el-col>
           </el-row>
@@ -321,6 +325,7 @@ export default {
       // 下单价格是否禁用
       disabledOrder: false,
       // 是否医院自有设备
+      loading: false,
       option: [
         {
           value: '0',
@@ -332,8 +337,8 @@ export default {
 
         }
       ],
-      //设备归属 0 平台设备 1医院设备
-      isPrivate:'',
+      // 设备归属 0 平台设备 1医院设备
+      isPrivate: '',
       cityOptions: regionData,
       // 存储省市区选中的地址码
       selectedOptions: [],
@@ -658,6 +663,7 @@ export default {
         form.useTime = JSON.stringify(form.useTime)
       }
       form.isPrivate = this.isPrivate
+      this.loading = true
       // TODO: please clear this log
       console.log('form=======================================', form)
       this.$refs['form'].validate(valid => {
@@ -668,6 +674,9 @@ export default {
           })
         }
       })
+      setTimeout(() => {
+        this.loading = false
+      }, 1000)
     },
     cancel() {
       this.$router.push({

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

@@ -33,14 +33,16 @@
           <el-col :span="8">
             <el-form-item
               :ref="'settingList.'+index+'.name'"
-              label="项目名称:"
+              label="项目名称"
               :prop="'settingList.'+index+'.name'"
               :rules="[
-                { required: true, message: '请输入项目名称', trigger: 'blur' }
+                { required: true, message: '请输入项目名称', trigger: 'blur' },
+                { min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
+
               ]"
             >
               <el-input
-                v-model="item.name"
+                v-model.trim="item.name"
                 :disabled="item.isUpdate === '1'"
                 placeholder="请输入项目名称"
               />
@@ -49,7 +51,7 @@
           <el-col :span="8">
             <el-form-item
               :ref="'settingList.'+index+'.type'"
-              label="检查类型:"
+              label="检查类型"
               :prop="'settingList.'+index+'.type'"
               :rules="[
                 { required: true, message: '请选择检查类型', trigger: 'change' }
@@ -72,10 +74,11 @@
           <el-col :span="8">
             <el-form-item
               :ref="'settingList.'+index+'.price'"
-              label="项目单价:"
+              label="项目单价"
               :prop="'settingList.'+index+'.price'"
               :rules="[
-                { required: true, message: '请输入项目单价', trigger: 'change' }
+                { required: true, message: '请输入项目单价', trigger: 'change' },
+
               ]"
             >
               <el-input-number
@@ -83,6 +86,7 @@
                 :min="0"
                 controls-position="right"
                 style="width: 240px"
+                @keydown.native="keydown($event)"
               />
               元
             </el-form-item>
@@ -93,7 +97,7 @@
           <el-col :span="8">
             <el-form-item
               :ref="'settingList.'+index+'.supportInsure'"
-              label="支持保险支付:"
+              label="支持保险支付"
               :prop="'settingList.'+index+'.supportInsure'"
               :rules="[
                 { required: true, message: '请选择是否支持保险支付', trigger: 'change' }
@@ -116,24 +120,24 @@
           <el-col :span="8">
             <el-form-item
               :ref="'settingList.'+index+'.sort'"
-              label="权重:"
+              label="权重"
               :prop="'settingList.'+index+'.sort'"
-              :rules="[
-                { required: true, message: '请输入权重', trigger: 'change' }
-              ]"
             >
               <el-input-number
                 v-model="item.sort"
                 :min="0"
+                :max="9999"
                 controls-position="right"
                 style="width: 256px"
+                @blur="handleBlur"
+                @keydown.native="keydown($event)"
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item
               :ref="'settingList.'+index+'.status'"
-              label="状态:"
+              label="状态"
               :prop="'settingList.'+index+'.status'"
               :rules="[
                 { required: true, message: '请选择状态', trigger: 'change' }
@@ -159,16 +163,16 @@
           <el-col :span="24">
             <el-form-item
               :ref="'settingList.'+index+'.content'"
-              label="描述:"
+              label="描述"
               :prop="'settingList.'+index+'.content'"
               :rules="[
                 { required: true, message: '请输入描述', trigger: 'blur' }
               ]"
             >
               <el-input
-                v-model="item.content"
+                v-model.trim="item.content"
                 type="textarea"
-                :rows="2"
+                :rows="4"
                 :disabled="item.isUpdate === '1'"
                 placeholder="请输入描述"
               />
@@ -180,7 +184,7 @@
     <div>
       <el-button class="fourWordsBtn" type="primary" size="mini" @click="handleAddItem">新增项目</el-button>
       <el-button v-loading.fullscreen.lock="fullscreenLoading" class="queryBtn" type="primary" size="mini" @click="handleSubmit">提交</el-button>
-      <el-button class="resetBtn" size="mini" @click="handleGoBack">返回</el-button>
+      <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返 回</el-button>
     </div>
   </div>
 </template>
@@ -205,12 +209,13 @@ export default {
             sort: '',
             status: '1',
             content: '',
-            itemType: '0' // 用于判断是检查的项目
+            itemType: '2' // 用于判断是检查的项目
           }
         ]
       },
       // 表单规则
       rules: {},
+
       // 检查类型
       statusOptions: [
         { value: '1', label: '已启用' },
@@ -250,6 +255,36 @@ export default {
         }
       })
     },
+
+    // 是权重不可以输入小数
+    handleBlur() {
+      const parsedValue = parseFloat(this.form.sort)
+      if (!isNaN(parsedValue)) {
+        this.form.sort = parsedValue.toFixed(0) // 保留一位小数并进行四舍五入
+      }
+    },
+    // 权重不能为0
+    validWeigh(rule, value, callback) {
+      if (value > 0) {
+        callback()
+      } else {
+        callback(new Error('权重不能为0'))
+      }
+    },
+    // 单位时段服务数不能为0
+    validUseNum(rule, value, callback) {
+      if (value > 0) {
+        callback()
+      } else {
+        callback(new Error('单位时段服务数不能为0'))
+      }
+    },
+    // 禁止输入空格
+    keydown(e) {
+      if (e.keyCode === 32) {
+        e.returnValue = false
+      }
+    },
     /** 将阿拉伯数字转成汉字（如:1变成一）*/
     convertToChineseNumeral(num) {
       // eslint-disable-next-line no-undef
@@ -327,7 +362,12 @@ export default {
         sort: '',
         status: '1',
         content: '',
-        itemType: '0'
+        itemType: '2'
+      })
+    },
+    cancel() {
+      this.$router.push({
+        path: '/equipment-management/equipment-management'
       })
     },
     // 提交
@@ -337,6 +377,7 @@ export default {
           console.log('成功通过....')
           const addList = JSON.parse(JSON.stringify(this.form.settingList))
           console.log('新增或者修改的集合', addList)
+          console.log('this.form.settingList', this.form.settingList)
           // 开始加loading遮罩, 防止操作
           // this.fullscreenLoading = true
           updateItem(addList).then(response => {
@@ -350,13 +391,13 @@ export default {
           })
         }
       })
-    },
-    // 返回
-    handleGoBack() {
-      this.$router.push({
-        path: '/service-management/medical-record-management'
-      })
     }
+    // // 返回
+    // handleGoBack() {
+    //   this.$router.push({
+    //     path: '/service-management/medical-record-management'
+    //   })
+    // }
   }
 }
 </script>

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

@@ -49,7 +49,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="设备类型">
-                  <el-select v-model="form.deviceType" disabled style="width: 250px">
+                  <el-select v-model="form.deviceType" disabled style="width: 250px" placeholder="暂无数据">
                     <el-option
                       v-for="(item,index) in dict.type.device_type"
                       :key="index"
@@ -75,7 +75,6 @@
                     expand-trigger="hover"
                     clearable
                     style="width: 250px"
-                    disabled
                     @change="handleChangeAddress"
                   />
                 </el-form-item>
@@ -84,7 +83,7 @@
                 <el-form-item prop="address" style="margin-left: 11%">
                   <el-input
                     v-model.trim="form.address"
-                    placeholder="暂无数据"
+                    placeholder="请输入详细地址地址(街道、楼牌号等)"
                     maxlength="40"
                     clearable
                     disabled
@@ -338,7 +337,7 @@
                 </el-form-item>
                 <el-form-item v-if="hpshow" label="医院自有设备" prop="deviceName">
 
-                  <el-select v-model="form.isPrivate" style="width: 250px" placeholder="请选择医院自有设备">
+                  <el-select v-model="form.isPrivate"disabled style="width: 250px" placeholder="请选择医院自有设备">
                     <el-option
                       v-for="(item ,index) in optionss"
                       :key="index"
@@ -378,32 +377,29 @@
             <!--            3-->
             <el-row>
 
-              <el-col :span="8">
-                <el-form-item label="服务地点" prop="addressCode">
+              <el-col :span="16">
+                <el-form-item label="服务地点" prop="selectedOptions">
                   <el-cascader
-
                     ref="serviceArea"
-                    v-model="form.selectedOptions"
+                    v-model="selectedOptions"
                     size="large"
                     :options="cityOptions"
-                    placeholder="请选择地区"
+                    placeholder="请选择服务地点"
                     expand-trigger="hover"
                     clearable
                     style="width: 250px"
                     @change="handleChangeAddress"
                   />
                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item prop="address" style="margin-left: 8.5%">
+
+                <el-form-item prop="address">
                   <el-input
                     v-model.trim="form.address"
-                    placeholder="请输入服务地址"
-                    maxlength="60"
+                    placeholder="请输入详细地址地址(街道、楼牌号等)"
+                    maxlength="40"
                     clearable
-                  >
-                    <template v-if="addtions.names !== ''" slot="prepend">{{ addtions.names }}</template>
-                  </el-input>
+                    style="width: 400px"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -666,6 +662,7 @@ export default {
       },
       // 表单参数
       form: {
+        selectedOptions: [],
         deviceName: '',
         // appointmentMethod: '',
         serviceArea: '',
@@ -967,7 +964,7 @@ export default {
     // 提交
     submitForm() {
       const form = deepClone(this.form)
-      console.log('selectedOptions', this.form.addressCode)
+      console.log('selectedOptions', this.selectedOptions)
       if (this.selectedOptions != null) {
         form.addressCode = this.selectedOptions.join(',')
       }
@@ -1025,8 +1022,11 @@ export default {
     handleUpdate() {
       getDevice(this.id).then(response => {
         this.form = response.data
-        if (this.form.selectedOptions != null && this.form.selectedOptions !== '') {
-          this.form.selectedOptions = response.data.addressCode.split(',')
+        if (this.selectedOptions != null && this.selectedOptions !== '') {
+          this.selectedOptions = response.data.addressCode.split(',')
+          console.log(':fsdfsddddddddd???????', response.data.addressCode)
+          console.log('详细个bbbbb', this.selectedOptions)
+          console.log('详细个ccccccccccc', this.form.selectedOptions)
         }
         if (this.form.serviceArea != null && this.form.serviceArea !== '') {
           this.form.serviceArea = response.data.serviceArea.split(',')
@@ -1041,7 +1041,6 @@ export default {
         // this.checkType = response.data.checkType.split(',')
 
         console.log('详情数据---', this.form)
-        console.log('form.usertadasd', this.form.ams)
         // this.serviceAreaS = this.form.serviceArea.split(';')
         // this.serviceArea = []
         // for (let i = 0; i < this.serviceAreaS.length; i++) {

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

@@ -116,7 +116,7 @@
           class="fourWordsBtn"
           icon="el-icon-download"
           size="mini"
-          @click="checkItem()"
+          @click="handlecheck"
         >检查项目</el-button>
       </el-col>
       <el-col :span="12" style="padding-bottom: 20px;text-align: end;">
@@ -163,10 +163,10 @@
 
       <el-table-column label="服务地点" align="left" show-overflow-tooltip>
         <template slot-scope="scope">
-
           <span>{{ scope.row.addressText + scope.row.address || "-" }}</span>
         </template>
       </el-table-column>
+
       <el-table-column label="预约方式" align="left" prop="reservationMethod" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.reservationMethod == 1 ? "按时段预约" :"-" }}</span>
@@ -530,12 +530,7 @@ export default {
         this.loading = false
       })
     },
-    // 点击检查项目
-    checkItem() {
-      this.$router.push({
-        name: 'CheckItem'
-      })
-    },
+
     // // 取消按钮
     // cancel() {
     //   this.open = false
@@ -633,6 +628,12 @@ export default {
         name: 'EquipmentAdd'
       })
     },
+    // 点击检查项目
+    handlecheck() {
+      this.$router.push({
+        name: 'EquipmentCheck'
+      })
+    },
 
     /**
      * 全部选择

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

@@ -19,7 +19,10 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="queryParams.checkItemsId" :disabled="queryParams.checkType === null || queryParams.checkType === ''" clearable placeholder="检查项目">
+        <el-select v-model="queryParams.checkItemsId"
+                   :disabled="queryParams.checkType === null || queryParams.checkType === ''" clearable
+                   placeholder="检查项目"
+        >
           <el-option
             v-for="item in checkItemOptions"
             :key="item.id"
@@ -64,32 +67,44 @@
         icon="el-icon-plus"
         size="mini"
         @click="selectAll()"
-      >选择全部</el-button>
+      >选择全部
+      </el-button>
       <el-button
         class="fourWordsBtn"
         icon="el-icon-edit"
         size="mini"
         @click="reverseSelect()"
-      >反向选择</el-button>
+      >反向选择
+      </el-button>
       <el-button
         class="fourWordsBtn"
         icon="el-icon-delete"
         size="mini"
         @click="handleExport()"
-      >批量导出</el-button>
+      >批量导出
+      </el-button>
       <el-button
         class="fourWordsBtn"
         icon="el-icon-download"
         size="mini"
         @click="checkItem()"
-      >检查项目</el-button>
-      <el-button style="position: relative; float: right;" class="resetBtn" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      <el-button style="position: relative; float: right;" class="queryBtn" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
+      >检查项目
+      </el-button>
+      <el-button style="position: relative; float: right;" class="resetBtn" icon="el-icon-refresh" size="mini"
+                 @click="resetQuery"
+      >重置
+      </el-button>
+      <el-button style="position: relative; float: right;" class="queryBtn" icon="el-icon-search" size="mini"
+                 @click="handleQuery"
+      >查询
+      </el-button>
     </el-row>
 
-    <el-table ref="table" v-loading="loading" :data="manageList" :row-key="getRowKeys" @selection-change="handleSelectionChange">
+    <el-table ref="table" v-loading="loading" :data="manageList" :row-key="getRowKeys"
+              @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
-      <el-table-column label="序号" type="index" align="center" />
+      <el-table-column label="序号" type="index" align="center"/>
       <el-table-column label="检查类型" align="center" prop="checkType" width="100">
         <template slot-scope="scope">
           <dict-tag
@@ -98,8 +113,8 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="检查项目" align="center" :show-overflow-tooltip="true" prop="checkItemsName" />
-      <el-table-column label="宠物昵称" align="center" :show-overflow-tooltip="true" prop="petNickname" />
+      <el-table-column label="检查项目" align="center" :show-overflow-tooltip="true" prop="checkItemsName"/>
+      <el-table-column label="宠物昵称" align="center" :show-overflow-tooltip="true" prop="petNickname"/>
       <el-table-column label="宠物保险" align="center" :show-overflow-tooltip="true" prop="insure">
         <template slot-scope="scope">
           <dict-tag
@@ -108,10 +123,10 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="宠主姓名" align="center" :show-overflow-tooltip="true" prop="nickname" />
-      <el-table-column label="联系方式" align="center" :show-overflow-tooltip="true" prop="phonenumber" width="90" />
-      <el-table-column label="预约兽医" align="center" :show-overflow-tooltip="true" prop="doctorName" />
-      <el-table-column label="所属科室" align="center" :show-overflow-tooltip="true" prop="doctorDeptName" />
+      <el-table-column label="宠主姓名" align="center" :show-overflow-tooltip="true" prop="nickname"/>
+      <el-table-column label="联系方式" align="center" :show-overflow-tooltip="true" prop="phonenumber" width="90"/>
+      <el-table-column label="预约兽医" align="center" :show-overflow-tooltip="true" prop="doctorName"/>
+      <el-table-column label="所属科室" align="center" :show-overflow-tooltip="true" prop="doctorDeptName"/>
       <el-table-column label="缴费状态" align="center" :show-overflow-tooltip="true" prop="payType">
         <template slot-scope="scope">
           <dict-tag
@@ -139,7 +154,9 @@
       </el-table-column>
       <el-table-column label="检查时段" align="center" :show-overflow-tooltip="true" prop="checkStartTime" width="80">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkStartTime, '{h}:{i}') + '-' + parseTime(scope.row.checkEndTime, '{h}:{i}') }}</span>
+          <span>{{
+              parseTime(scope.row.checkStartTime, '{h}:{i}') + '-' + parseTime(scope.row.checkEndTime, '{h}:{i}')
+            }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
@@ -149,12 +166,16 @@
             size="mini"
             icon="el-icon-document"
             @click="handleDetails(scope.row)"
-          >详情</el-button>
+          >详情
+          </el-button>
           <el-button
             class="bookNow"
             size="mini"
             icon="el-icon-check"
+            @click="handleSubscribe(scope.row)"
             :disabled="scope.row.deviceId !== null"
+          >立即预约
+          </el-button>
             @click="handleSubscribe(scope.row)"
           >立即预约</el-button>
         </template>
@@ -170,12 +191,16 @@
     />
 
     <!-- 添加或修改业务管理-检查管理对话框 -->
-    <el-dialog title="立即预约" :visible.sync="open" width="800px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false">
+    <el-dialog title="立即预约" :visible.sync="open" width="800px" append-to-body :close-on-press-escape="false"
+               :close-on-click-modal="false"
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="8">
             <el-form-item label="设备">
-              <el-select v-model="form.equipmentIdList" multiple collapse-tags clearable placeholder="请选择设备" @change="changeDeviceName">
+              <el-select v-model="form.equipmentIdList" multiple collapse-tags clearable placeholder="请选择设备"
+                         @change="changeDeviceName"
+              >
                 <el-option
                   v-for="item in selectableDevice"
                   :key="item.id"
@@ -190,10 +215,10 @@
               <el-date-picker
                 v-model="form.checkDate"
                 type="date"
+                @change="changeDate"
                 placeholder="请选择检查日期"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
-                @change="changeDate"
               />
             </el-form-item>
           </el-col>
@@ -208,18 +233,19 @@
         :data="deviceList"
         style="width: 100%"
       >
-        <el-table-column prop="deviceName" align="left" label="设备名称" />
-        <el-table-column prop="checkDate" align="left" label="检查日期" />
-        <el-table-column prop="checkTime" align="left" label="检查时段" />
-        <el-table-column prop="num" align="left" label="剩余可预约" />
-        <el-table-column prop="date" align="left" label="设备服务费" />
+        <el-table-column prop="deviceName" align="left" label="设备名称"/>
+        <el-table-column prop="checkDate" align="left" label="检查日期"/>
+        <el-table-column prop="checkTime" align="left" label="检查时段"/>
+        <el-table-column prop="num" align="left" label="剩余可预约"/>
+        <el-table-column prop="date" align="left" label="设备服务费"/>
         <el-table-column align="left" label="操作">
           <template slot-scope="scope">
             <el-button
               class="fourWordsBtn"
               size="mini"
               @click="handleSubscribeDevice(scope.row)"
-            >立即预约</el-button>
+            >立即预约
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -230,10 +256,10 @@
         :limit.sync="deviceQueryParams.pageSize"
         @pagination="getDevice"
       />
-      <!--      <div slot="footer" class="dialog-footer">-->
-      <!--        <el-button type="primary" @click="submitForm">确 定</el-button>-->
-      <!--        <el-button @click="cancel">取 消</el-button>-->
-      <!--      </div>-->
+<!--      <div slot="footer" class="dialog-footer">-->
+<!--        <el-button type="primary" @click="submitForm">确 定</el-button>-->
+<!--        <el-button @click="cancel">取 消</el-button>-->
+<!--      </div>-->
     </el-dialog>
   </div>
 </template>
@@ -325,8 +351,7 @@ export default {
         checkDate: null // 检查日期
       },
       // 表单校验
-      rules: {
-      },
+      rules: {},
       // 设备集合
       deviceList: [],
       // 检查类型列表
@@ -614,7 +639,8 @@ export default {
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess('删除成功')
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -624,13 +650,29 @@ export default {
       if (this.ids.length !== 0) {
         const exportTable = {}
         exportTable.treatIds = this.ids
-        this.download('business/check/export', exportTable, `manage_${new Date().getTime()}.xlsx`).then(res => {
+        this.download('business/check/export', exportTable, `检查管理-${this.exportFormatTime(new Date())}.xlsx`).then(res => {
           this.$refs.table.clearSelection()
         })
       } else {
         this.$modal.msgError('请选择至少一条数据导出')
         return
       }
+    },
+    // 导出格式化
+    exportFormatTime(date) {
+      // 获取年月日
+      var year = date.getFullYear()
+      var month = date.getMonth() + 1 // 月份从0开始，需要加1
+      var day = date.getDate()
+      // 将年月日格式化为字符串
+      if (month < 10) {
+        month = '0' + month
+      }
+      if (day < 10) {
+        day = '0' + day
+      }
+      const formattedDate = year.toString() + month.toString() + day.toString()
+      return formattedDate
     }
   }
 }
@@ -643,8 +685,9 @@ export default {
   border-radius: 6px 6px 6px 6px;
   border: 1px solid rgb(95, 181, 75);
   color: #5FB54B;
-  background: rgba(91,182,71,0.08);
+  background: rgba(91, 182, 71, 0.08);
   font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
   &:hover {
     background: rgba(95, 181, 75, 0.08);
     opacity: 1;
@@ -652,14 +695,16 @@ export default {
     color: #5FB54B !important;
   }
 }
+
 /** 立即预约 */
 .bookNow {
   width: 80px;
   border-radius: 6px 6px 6px 6px;
   border: 1px solid rgb(255, 157, 78);
   color: #FF9D4E;
-  background: rgba(255,157,78,0.08);
+  background: rgba(255, 157, 78, 0.08);
   font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
   &:hover {
     background: rgba(95, 181, 75, 0.08);
     opacity: 1;
@@ -667,6 +712,7 @@ export default {
     color: #FF9D4E !important;
   }
 }
+
 .app-container {
   background-color: #FFFFFF;
 }