测试bug修改

.env.development

@@ -4,12 +4,12 @@ NODE_ENV = development
 ENV = 'development'
 
 # 测试地址 API接口
-# VUE_APP_BASE_API = 'https://zplma-b.caimei365.com'
-VUE_APP_BASE_API = 'http://192.168.2.68:8012'
+VUE_APP_BASE_API = 'https://zplma-b.caimei365.com'
+# VUE_APP_BASE_API = 'http://192.168.2.68:8012'
 
 # 文件上传 API接口地址
-# VUE_APP_UPLOAD_API='https://zplma-b.caimei365.com'
-VUE_APP_UPLOAD_API='http://192.168.2.68:8012'
+VUE_APP_UPLOAD_API='https://zplma-b.caimei365.com'
+# VUE_APP_UPLOAD_API='http://192.168.2.68:8012'
 
 # 二维码生成链接location
 VUE_APP_BASE_SERVER = 'https://www-b.caimei365.com'
@@ -19,8 +19,8 @@ VUE_APP_SOCKET_SERVER = 'wss://zplma-b.caimei365.com/websocket?sessionSource=zpl
 # VUE_APP_SOCKET_SERVER = 'ws://192.168.2.68:8012/websocket?sessionSource=zplm_admin'
 
 # 网站地址
-VUE_APP_LOCAL = 'http://192.168.2.81:9527'
-# VUE_APP_LOCAL = 'http://zplm-b.caimei365.com'
+# VUE_APP_LOCAL = 'http://192.168.2.81:9527'
+VUE_APP_LOCAL = 'http://zplm-b.caimei365.com'
 
 
 # 支付

src/views/components/DoctorCustomItems/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="doctor-custom-items">
     <div v-for="formData in formDataList" :key="formData.uuid" class="custom-section">
-      <i v-if="formDataList.length > 1" class="el-icon-close remove" title="移除该项" @click="removeOne(formData)" />
+      <i class="el-icon-close remove" title="移除该项" @click="removeOne(formData)" />
       <el-form :ref="'form' + formData.uuid" :model="formData" :rules="rules" label-width="90px">
         <el-form-item label="字段名称" prop="name">
           <el-input v-model="formData.name" placeholder="字段名称" />
@@ -21,11 +21,7 @@ export default {
   data() {
     return {
       uuid: 1,
-      formDataList: [{
-        uuid: 1,
-        name: '',
-        content: ''
-      }],
+      formDataList: [],
       rules: {
         name: [{ required: true, message: '字段名称不能为空', tiggers: ['blur'] }],
         content: [{ required: true, message: '字段内容不能为空', tiggers: ['blur'] }]

src/views/normal/club/device-cate.vue

@@ -25,10 +25,7 @@
       </div>
       <div class="filter-control">
         <permission-button type="primary" @click="handleFilter">查询</permission-button>
-        <permission-button
-          type="primary"
-          @click="handleAdd"
-        >添加</permission-button>
+        <permission-button type="primary" @click="handleAdd">添加</permission-button>
       </div>
     </div>
     <!-- 表格区域 -->
@@ -39,7 +36,7 @@
       border
       fit
       highlight-current-row
-      style="width: 100%;"
+      style="width: 100%"
       header-row-class-name="tableHeader"
     >
       <el-table-column label="序号" :index="indexMethod" type="index" align="center" width="80" />
@@ -55,7 +52,7 @@
             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">
               <el-tag slot="reference" size="small" type="danger" class="reason">
                 <span>审核未通过</span>
-                <span class="el-icon-question status danger " />
+                <span class="el-icon-question status danger" />
               </el-tag>
             </el-popover>
             <!-- 未通过原因展示END -->
@@ -68,17 +65,17 @@
           <!-- 只有审核通过了才能操作上下线 auditStatus ：审核状态 -->
           <template v-if="row.auditStatus === 1">
             <template v-if="row.status === 0">
-              <span style="margin-right:10px;" class="status danger">已下线</span>
+              <span style="margin-right: 10px" class="status danger">已下线</span>
               <permission-button type="primary" size="mini" @click="handleChangeStatus(row)">上线</permission-button>
             </template>
             <template v-else>
-              <span style="margin-right:10px;" class="status success ">已上线</span>
+              <span style="margin-right: 10px" class="status success">已上线</span>
               <permission-button type="info" size="mini" @click="handleChangeStatus(row)">下线</permission-button>
             </template>
           </template>
           <template v-else>
             <!-- <el-tag type="warning">待上线</el-tag> -->
-            <span style="margin-right:10px;" class="status warning">待上线</span>
+            <span style="margin-right: 10px" class="status warning">待上线</span>
           </template>
         </template>
       </el-table-column>
@@ -91,16 +88,8 @@
       <!-- <el-table-column v-if="false" label="创建人" width="180px" align="center" prop="createBy" /> -->
       <el-table-column label="操作" align="center" width="240px" class-name="small-padding fixed-width">
         <template slot-scope="{ row }">
-          <permission-button
-            type="primary"
-            size="mini"
-            @click="handleEdit(row)"
-          >
-            编辑
-          </permission-button>
-          <permission-button type="danger" size="mini" @click="handleRemove(row)">
-            删除
-          </permission-button>
+          <permission-button type="primary" size="mini" @click="handleEdit(row)"> 编辑 </permission-button>
+          <permission-button type="danger" size="mini" @click="handleRemove(row)"> 删除 </permission-button>
         </template>
       </el-table-column>
     </el-table>
@@ -115,12 +104,7 @@
     />
 
     <!-- 设备添加对话框 -->
-    <el-dialog
-      title="添加设备"
-      :visible.sync="dialogVisible"
-      width="30%"
-      @close="onDialogClose"
-    >
+    <el-dialog title="添加设备" :visible.sync="dialogVisible" width="30%" @close="onDialogClose">
       <el-form ref="form" :model="formData" :rules="rules" label-width="100px">
         <el-form-item prop="name" label="设备名称：">
           <el-input v-model="formData.name" placeholder="请输入设备名称" />
@@ -138,7 +122,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="onSave">保 存</el-button>
+        <el-button type="primary" :loading="isLoading" @click="onSave">保 存</el-button>
       </span>
     </el-dialog>
   </div>
@@ -174,6 +158,7 @@ export default {
 
   data() {
     return {
+      isLoading: false,
       tableKey: 0,
       list: null,
       total: 0,
@@ -218,11 +203,27 @@ export default {
     },
     // 改变启用状态
     async handleChangeStatus(row) {
-      row.status = row.status ? 0 : 1
+      let status = Boolean(row.status)
+      const tip = status ? '下架' : '上架'
+      let confirmType = ''
+      try {
+        confirmType = await this.$confirm(`确定${tip}该设备管理吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+        status = !status
+      } catch (error) {
+        console.log(error)
+      }
+
+      if (confirmType !== 'confirm') {
+        return
+      }
       try {
         await updateProductCateStatus({
           productTypeId: row.productTypeId,
-          status: row.status
+          status: Number(status)
         })
         this.$message.success('修改设备状态成功')
         this.fetchProductList()
@@ -243,10 +244,12 @@ export default {
     },
     // 保存
     async onSave() {
+      this.isLoading = true
       try {
         await this.$refs.form.validate()
       } catch (error) {
         console.log(error)
+        this.isLoading = false
       }
       this.formData.authUserId = this.authUserId
       this.formData.createBy = this.authUserId
@@ -257,6 +260,8 @@ export default {
         this.fetchProductList()
       } catch (error) {
         console.log(error)
+      } finally {
+        this.isLoading = false
       }
     },
     // 添加分类
@@ -322,13 +327,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.app-container{
-  ::v-deep{
-    .el-dialog__body{
+.app-container {
+  ::v-deep {
+    .el-dialog__body {
       padding-bottom: 0;
     }
   }
-  .pd-10{
+  .pd-10 {
     padding-top: 10px;
   }
 }

src/views/normal/club/device/edit.vue

@@ -198,6 +198,9 @@ export default {
             if (key !== 'paramList') {
               this.formData[key] = res.data[key]
             }
+            if (key === 'productTypeId') {
+              this.formData[key] = parseInt(res.data[key])
+            }
           }
         }
         // 初始化参数

src/views/normal/club/user/index.vue

@@ -73,7 +73,7 @@
           <el-input v-model="formData.name" placeholder="请输入姓名" />
         </el-form-item>
         <el-form-item label="手机号：" prop="mobile">
-          <el-input v-model="formData.mobile" placeholder="请输入手机号" maxlength="11" show-word-limit />
+          <el-input v-model="formData.mobile" placeholder="请输入手机号" maxlength="11" show-word-limit @input="handleInput" />
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -187,6 +187,14 @@ export default {
 
     // 保存用户信息
     async onSave() {
+      let valide = false
+      try {
+        valide = await this.$refs.form.validate()
+      } catch (error) {
+        console.log(error)
+      }
+      if (!valide) return
+
       this.formData.authId = this.authId
       try {
         await createClubUser(this.formData)
@@ -226,6 +234,11 @@ export default {
       this.formData = resetFormData()
     },
 
+    // 手机号只允许数字
+    handleInput() {
+      this.formData.mobile = this.formData.mobile.replace(/\D/gi, '')
+    },
+
     indexMethod(index) {
       return index + this.listQuery.pageSize * (this.listQuery.pageNum - 1) + 1
     }

src/views/normal/material/package/index.vue

@@ -124,7 +124,7 @@
         <el-form-item label="资料包路径：" prop="fileName" style="margin-bottom:0">
           <upload-file
             ref="fileUpload"
-            accept=".zip"
+            accept=".zip,.rar,.7z"
             mode="document"
             :file-list="fileList"
             :auto-upload="false"

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

@@ -10,7 +10,7 @@
       <!-- <el-form-item label="所在机构:" prop="clubName">
         <el-input v-model="formData.clubName" placeholder="请输入机构名称" />
       </el-form-item> -->
-      <el-form-item label="所在机构:" prop="clubName">
+      <el-form-item label="所在机构:" :prop="formData.authId ? 'authId' : 'clubName'">
         <el-select
           v-model="selectClub"
           style="width: 100%"
@@ -46,7 +46,7 @@
         />
       </el-form-item>
 
-      <el-form-item label="操作医师标签" prop="tagList">
+      <el-form-item label="操作医师标签:" prop="tagList">
         <el-input v-show="false" v-model="formData.tagList" />
         <div class="tag-control">
           <input v-model="tagName" class="el-input el-input__inner" placeholder="输入标签名后点击添加按钮">
@@ -59,7 +59,7 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="自定义属性">
+      <el-form-item label="自定义属性:">
         <doctor-custom-items v-if="!isRequest" ref="customItems" @change="customItemsChange" />
       </el-form-item>
 
@@ -122,6 +122,7 @@ export default {
         ],
         certificateNo: [{ required: true, validator: validateCertificateNo, trigger: ['blur', 'change'] }],
         clubName: [{ required: true, message: '所在机构不能为空', trigger: ['blur', 'change'] }],
+        authId: [{ required: true, message: '所在机构不能为空', trigger: ['change'] }],
         doctorImage: [{ required: true, message: '请上传医师照片', trigger: 'change' }],
         banner: [{ required: true, message: '请上传至少一张轮播图', trigger: 'change' }],
         equipment: [{ required: true, message: '具备操作资格设备不能为空', trigger: 'change' }],

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

@@ -10,7 +10,7 @@
       <!-- <el-form-item label="所在机构:" prop="clubName">
         <el-input v-model="formData.clubName" placeholder="请输入机构名称" />
       </el-form-item> -->
-      <el-form-item label="所在机构:" prop="clubName">
+      <el-form-item label="所在机构:" :prop="formData.authId ? 'authId' : 'clubName'">
         <el-select
           v-model="selectClub"
           style="width: 100%"
@@ -126,6 +126,7 @@ export default {
         ],
         certificateNo: [{ required: true, validator: validateCertificateNo, trigger: ['blur', 'change'] }],
         clubName: [{ required: true, message: '所在机构不能为空', trigger: ['blur', 'change'] }],
+        authId: [{ required: true, message: '所在机构不能为空', trigger: ['change'] }],
         doctorImage: [{ required: true, message: '请上传医师照片', trigger: 'change' }],
         banner: [{ required: true, message: '请上传至少一张轮播图', trigger: 'change' }],
         equipment: [{ required: true, message: '具备培训资格设备不能为空', trigger: 'change' }],

src/views/normal/vip/index.vue

@@ -55,7 +55,7 @@ export default {
         },
         {
           image: vipIcon3,
-          name: '医师资格认证',
+          name: '人员资格认证',
           subName: '享认证数量不限'
         },
         {