Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/index.js

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

@@ -8,7 +8,7 @@
           </div>
           <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="auto">
             <div class="title-paragraph">
-              <div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">基本信息</div>
+              <div style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;">基本信息</div>
             </div>
             <!--            1-->
             <el-row>
@@ -94,7 +94,7 @@
                     placeholder="请输入详细地址地址(街道、楼牌号等)"
                     maxlength="40"
                     clearable
-                    style="width: 400px"
+                    style="width: 436px"
                   />
                 </el-form-item>
               </el-col>
@@ -404,7 +404,7 @@ export default {
           { required: true, message: '请选择预约方式', trigger: 'change' }
         ],
         remark: [
-          { min: 2, max: 200, message: '输入内容长度应为2~200个字符', trigger: 'blur' }
+          { min: 2, max: 200, message: '备注长度必须介于2~200之间', trigger: 'blur' }
         ],
         serviceArea: [
           { required: true, message: '请选择支持服务地区', trigger: 'blur' }

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

@@ -8,7 +8,7 @@
           </div>
           <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="auto">
             <div class="title-paragraph">
-              <div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">基本信息</div>
+              <div style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;">基本信息</div>
             </div>
             <!--            1-->
             <el-row>
@@ -23,10 +23,21 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="userType === '00' ?'平台自有设备':'医院自有设备'" prop="isPrivate">
-                  <el-select v-model="form.isPrivate" disabled style="width: 250px">
+                <el-form-item v-if="isShow" label="平台自有设备">
+                  <el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择平台自有设备" disabled>
+                    <el-option
+                      v-for="(item, index) in optionsp"
+                      :key="index"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+                <el-form-item v-if="hpshow" label="医院自有设备">
+
+                  <el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择医院自有设备" disabled>
                     <el-option
-                      v-for="(item, index) in optionss"
+                      v-for="(item ,index) in optionsh"
                       :key="index"
                       :label="item.label"
                       :value="item.value"
@@ -81,13 +92,14 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item prop="address" style="margin-left: 11%">
+                <el-form-item >
                   <el-input
                     v-model.trim="form.address"
-                    placeholder="请输入详细地址地址(街道、楼牌号等)"
+                    placeholder="暂无数据"
                     maxlength="40"
                     clearable
                     disabled
+                    style="width: 400px"
                   >
                     <template v-if="addtions.names !== ''" slot="prepend">{{ addtions.names }}</template>
                   </el-input>
@@ -163,7 +175,7 @@
             <!--            5-->
             <el-row>
 
-              <el-col :span="8" style="margin-left: 33.5%">
+              <el-col :span="8" style="margin-left: 33.3%">
                 <el-form-item label="下午开始时间">
                   <el-time-select
                     v-model="form.useTime.pms"
@@ -284,7 +296,7 @@
             </el-row>
           </el-form>
           <div class="title-paragraph">
-            <div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">使用信息</div>
+            <div style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;">使用信息</div>
           </div>
           <el-table :data="useList" :header-cell-style="{ background:'#E8E9E8'}" border>
             <el-table-column label="检查项目" align="center" prop="checkItemsName" show-overflow-tooltip />
@@ -311,7 +323,7 @@
           </div>
           <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="auto">
             <div class="title-paragraph">
-              <div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">基本信息</div>
+              <div style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;">基本信息</div>
             </div>
             <!--            1-->
             <el-row>
@@ -329,7 +341,7 @@
                 <el-form-item v-if="isShow" label="平台自有设备">
                   <el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择平台自有设备">
                     <el-option
-                      v-for="(item, index) in optionss"
+                      v-for="(item, index) in optionsp"
                       :key="index"
                       :label="item.label"
                       :value="item.value"
@@ -340,7 +352,7 @@
 
                   <el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择医院自有设备">
                     <el-option
-                      v-for="(item ,index) in optionss"
+                      v-for="(item ,index) in optionsh"
                       :key="index"
                       :label="item.label"
                       :value="item.value"
@@ -740,7 +752,7 @@ export default {
           { required: true, message: '请选择预约方式', trigger: 'change' }
         ],
         remark: [
-          { min: 2, max: 200, message: '输入内容长度应为2~200个字符', trigger: 'blur' }
+          { min: 2, max: 200, message: '备注长度必须介于2~200之间', trigger: 'blur' }
         ],
         serviceArea: [
           { required: true, message: '请选择支持服务地区', trigger: 'blur' }
@@ -749,8 +761,16 @@ export default {
           { required: true, message: '请选择支持检查类型', trigger: 'blur' }
         ]
       },
+      // 是否平台自有设备
+      optionsp: [{
+        value: '0',
+        label: '是'
+      }, {
+        value: '1',
+        label: '否'
+      }],
       // 是否医院自有设备
-      optionss: [{
+      optionsh: [{
         value: '0',
         label: '否'
       }, {

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

@@ -55,7 +55,7 @@
           v-model="daterangeCreateTime"
           type="date"
           style="width: 240px"
-          placeholder="选择创建日期"
+          placeholder="请选择创建日期"
           value-format="yyyy-MM-dd"
         />
       </el-form-item>
@@ -113,6 +113,7 @@
         >批量导出
         </el-button>
         <el-button
+          v-if="userType==='00'"
           class="fourWordsBtn"
           icon="el-icon-download"
           size="mini"
@@ -514,7 +515,6 @@ export default {
     },
     /** 查询设备列表 */
     getList() {
-      this.loading = true
       if (this.daterangeCreateTime !== '') {
         this.queryParams.beginCheckTime = this.daterangeCreateTime + ' 00:00:00'
         this.queryParams.endCheckTime = this.daterangeCreateTime + ' 23:59:59'