Merge branch 'master' into developer

.env.development

@@ -6,7 +6,7 @@ ENV = 'development'
 # 测试地址 API接口
 VUE_APP_BASE_API = 'https://zplma-b.caimei365.com'
 # VUE_APP_BASE_API = 'http://192.168.2.200:8012'
-# VUE_APP_BASE_API = 'http://192.168.2.67:8012'
+# VUE_APP_BASE_API = 'http://192.168.2.92:8012'
 
 # 文件上传 API接口地址
 VUE_APP_UPLOAD_API='https://zplma-b.caimei365.com'

src/views/components/SncodeList/index.vue

@@ -6,7 +6,7 @@
         <el-input v-model="listQuery.sncode" placeholder="设备SN码" size="mini" @keyup.enter.native="handleFilter" />
       </div>
       <div class="filter-control">
-        <el-button size="mini" type="primary">搜索</el-button>
+        <el-button size="mini" type="primary" @click="handleFilter">搜索</el-button>
       </div>
     </div>
     <el-table

src/views/normal/personnel/operate/edit.vue

@@ -139,8 +139,8 @@ export default {
         authId: [{ required: true, message: '所在机构不能为空', trigger: ['change'] }],
         doctorImage: [{ required: true, message: '请上传医师照片', trigger: 'change' }],
         banner: [{ required: true, message: '请上传至少一张轮播图', trigger: 'change' }],
-        equipment: [{ required: true, message: '具备操作资格设备不能为空', trigger: 'change' }],
-        tagList: [{ required: true, message: '医师标签不能为空', trigger: 'change' }]
+        equipment: [{ required: true, message: '具备操作资格设备不能为空', trigger: 'change' }]
+        // tagList: [{ required: true, message: '医师标签不能为空', trigger: 'change' }]
       },
       // logo图片列表
       doctorImageList: [],

src/views/normal/personnel/training/edit.vue

@@ -134,8 +134,8 @@ export default {
         authId: [{ required: true, message: '所在机构不能为空', trigger: ['change'] }],
         doctorImage: [{ required: true, message: '请上传医师照片', trigger: 'change' }],
         banner: [{ required: true, message: '请上传至少一张轮播图', trigger: 'change' }],
-        equipment: [{ required: true, message: '具备培训资格设备不能为空', trigger: 'change' }],
-        tagList: [{ required: true, message: '医师标签不能为空', trigger: 'change' }]
+        equipment: [{ required: true, message: '具备培训资格设备不能为空', trigger: 'change' }]
+        // tagList: [{ required: true, message: '医师标签不能为空', trigger: 'change' }]
       },
       // logo图片列表
       doctorImageList: [],