ct 3 giorni fa
parent
commit
2e7411abc6

+ 52 - 14
src/views/member/list.vue

@@ -171,7 +171,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="看课状态" align="center">
+      <el-table-column label="看课状态" align="center" width="80px">
         <template slot-scope="scope">
           <el-tag :type="getCourseStatusType(scope.row.courseCountStatus)">
             {{ getCourseStatusText(scope.row.courseCountStatus) }}
@@ -193,6 +193,19 @@
             @click="handleAudit(scope.row)"
             v-if="scope.row.isCurrentCompanyUser === 1 && scope.row.status === 0"
           >审核会员</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['user:fsUser:edit']"
+          >修改</el-button>
+
+          <el-button
+            size="mini"
+            type="text"
+            @click="handledetails(scope.row)"
+          >详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -219,10 +232,10 @@
           </el-popover>
         </el-form-item>
         <el-form-item label="昵称" prop="nickname">
-          <el-input v-model="form.nickname" placeholder="请输入昵称" />
+          <el-input v-model="form.nickname" :disabled="true" placeholder="请输入昵称" />
         </el-form-item>
         <el-form-item label="手机号码" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入手机号码" />
+          <el-input v-model="form.phone" disabled placeholder="请输入手机号码" />
         </el-form-item>
         <el-form-item label="最后登录IP" prop="lastIp" v-if="form.lastIp">
           <el-input v-model="form.lastIp" disabled placeholder="最后一次登录IP" />
@@ -233,8 +246,8 @@
         <el-form-item label="缺课数量" prop="missCourseCount" v-if="form.missCourseCount">
           <el-input v-model="form.missCourseCount" disabled placeholder="缺课数量" />
         </el-form-item>
-        <el-form-item label="标签" prop="tagIds">
-          <el-select v-model="form.tagIds" placeholder="请选择标签" clearable multiple>
+        <!-- <el-form-item label="标签" prop="tagIds">
+          <el-select v-model="form.tagIds" disabled placeholder="请选择标签" clearable multiple>
             <el-option
               v-for="item in tagOptions"
               :key="item.tagId"
@@ -242,11 +255,15 @@
               :value="item.tagId"
             />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="标签" prop="tag">
+          <el-input v-model="form.tag" disabled  clearable >
+          </el-input>
         </el-form-item>
         <el-form-item label="所属员工" prop="companyUserId">
-          <el-select v-model="form.companyUserId" placeholder="请选择所属员工" clearable>
+          <el-select v-model="form.companyUserId" disabled placeholder="请选择所属员工" clearable>
             <el-option
-              v-for="item in salesOptions"
+              v-for="item in companyUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -298,6 +315,13 @@
       </div>
     </el-dialog>
 
+    <el-drawer
+        :with-header="false"
+        size="75%"
+          :title="show.title" :visible.sync="show.open">
+      <userDetails  ref="userDetails" />
+    </el-drawer>
+
   </div>
 </template>
 
@@ -305,11 +329,17 @@
 import { listUser, getUser, addUser, updateUser, delUser, exportUser, auditUser } from "@/api/user/fsUser";
 import {transferUser} from "@/api/users/user";
 import {getUserList} from "@/api/company/companyUser";
+import userDetails from '@/views/store/components/userDetails.vue';
 
 export default {
   name: "FsUser",
+  components: {userDetails},
   data() {
     return {
+      show:{
+        title:"会员详情",
+        open:false,
+      },
       cusTransfer: {
         targetUserId: [{required: true, message: '请选择转移至销售', trigger: 'change'}],
         content: [{required: true, message: '请选择转移至销售', trigger: 'change'}]
@@ -366,13 +396,13 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        nickname: [
-          { required: true, message: "昵称不能为空", trigger: "blur" }
-        ],
-        phone: [
-          { required: true, message: "手机号码不能为空", trigger: "blur" },
-          { pattern: /^1[3-9]\d{9}$/, message: "请输入正确的手机号码", trigger: "blur" }
-        ],
+        // nickname: [
+        //   { required: true, message: "昵称不能为空", trigger: "blur" }
+        // ],
+        // phone: [
+        //   { required: true, message: "手机号码不能为空", trigger: "blur" },
+          // { pattern: /^1[3-9]\d{9}$/, message: "请输入正确的手机号码", trigger: "blur" }
+        // ],
         status: [
           { required: true, message: "状态不能为空", trigger: "change" }
         ]
@@ -393,6 +423,12 @@ export default {
     this.getSalesOptions();
   },
   methods: {
+    handledetails(row){
+            this.show.open=true;
+            setTimeout(() => {
+                 this.$refs.userDetails.getDetails(row.userId);
+            }, 1);
+     },
     /** 提交转移按钮 (如果使用对话框) */
 
     submitTransfer() {
@@ -582,6 +618,8 @@ export default {
           }
 
           if (this.form.userId != null) {
+            //手机号不能修改 置空
+            this.form.phone = null;
             updateUser(this.form).then(response => {
               if (response.code === 200) {
                 this.$message.success("修改成功");

+ 49 - 14
src/views/member/mylist.vue

@@ -193,6 +193,19 @@
             @click="handleAudit(scope.row)"
             v-if="scope.row.isCurrentCompanyUser === 1 && scope.row.status === 0"
           >审核会员</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['user:fsUser:edit']"
+          >修改</el-button>
+
+          <el-button
+            size="mini"
+            type="text"
+            @click="handledetails(scope.row)"
+          >详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -219,10 +232,10 @@
           </el-popover>
         </el-form-item>
         <el-form-item label="昵称" prop="nickname">
-          <el-input v-model="form.nickname" placeholder="请输入昵称" />
+          <el-input v-model="form.nickname" :disabled="true" placeholder="请输入昵称" />
         </el-form-item>
         <el-form-item label="手机号码" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入手机号码" />
+          <el-input v-model="form.phone" disabled placeholder="请输入手机号码" />
         </el-form-item>
         <el-form-item label="最后登录IP" prop="lastIp" v-if="form.lastIp">
           <el-input v-model="form.lastIp" disabled placeholder="最后一次登录IP" />
@@ -233,8 +246,8 @@
         <el-form-item label="缺课数量" prop="missCourseCount" v-if="form.missCourseCount">
           <el-input v-model="form.missCourseCount" disabled placeholder="缺课数量" />
         </el-form-item>
-        <el-form-item label="标签" prop="tagIds">
-          <el-select v-model="form.tagIds" placeholder="请选择标签" clearable multiple>
+        <!-- <el-form-item label="标签" prop="tagIds">
+          <el-select v-model="form.tagIds" disabled placeholder="请选择标签" clearable multiple>
             <el-option
               v-for="item in tagOptions"
               :key="item.tagId"
@@ -242,11 +255,15 @@
               :value="item.tagId"
             />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="标签" prop="tag">
+          <el-input v-model="form.tag" disabled  clearable >
+          </el-input>
         </el-form-item>
         <el-form-item label="所属员工" prop="companyUserId">
-          <el-select v-model="form.companyUserId" placeholder="请选择所属员工" clearable>
+          <el-select v-model="form.companyUserId" disabled placeholder="请选择所属员工" clearable>
             <el-option
-              v-for="item in salesOptions"
+              v-for="item in companyUserList"
               :key="item.userId"
               :label="item.nickName"
               :value="item.userId"
@@ -297,6 +314,13 @@
       </div>
     </el-dialog>
 
+    <el-drawer
+        :with-header="false"
+        size="75%"
+          :title="show.title" :visible.sync="show.open">
+      <userDetails  ref="userDetails" />
+    </el-drawer>
+
   </div>
 </template>
 
@@ -304,11 +328,16 @@
 import { listUser, getUser, addUser, updateUser, delUser, exportUser, auditUser } from "@/api/user/fsUser";
 import {transferUser} from "@/api/users/user";
 import {getUserList} from "@/api/company/companyUser";
-
+import userDetails from '@/views/store/components/userDetails.vue';
 export default {
   name: "FsUser",
+  components: {userDetails},
   data() {
     return {
+      show:{
+        title:"会员详情",
+        open:false,
+      },
       cusTransfer: {
         targetUserId: [{required: true, message: '请选择转移至销售', trigger: 'change'}],
         content: [{required: true, message: '请选择转移至销售', trigger: 'change'}]
@@ -364,13 +393,13 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        nickname: [
-          { required: true, message: "昵称不能为空", trigger: "blur" }
-        ],
-        phone: [
-          { required: true, message: "手机号码不能为空", trigger: "blur" },
-          { pattern: /^1[3-9]\d{9}$/, message: "请输入正确的手机号码", trigger: "blur" }
-        ],
+        // nickname: [
+        //   { required: true, message: "昵称不能为空", trigger: "blur" }
+        // ],
+        // phone: [
+        //   { required: true, message: "手机号码不能为空", trigger: "blur" },
+        //   { pattern: /^1[3-9]\d{9}$/, message: "请输入正确的手机号码", trigger: "blur" }
+        // ],
         status: [
           { required: true, message: "状态不能为空", trigger: "change" }
         ]
@@ -391,6 +420,12 @@ export default {
     this.getSalesOptions();
   },
   methods: {
+    handledetails(row){
+            this.show.open=true;
+            setTimeout(() => {
+                 this.$refs.userDetails.getDetails(row.userId);
+            }, 1);
+     },
     /** 提交转移按钮 (如果使用对话框) */
 
     submitTransfer() {

+ 1 - 0
src/views/store/components/userAddDetails.vue

@@ -92,6 +92,7 @@ export default {
   name: "UserAddress",
   data() {
     return {
+      orOptions:[],
       // 遮罩层
       loading: true,
       // 导出遮罩层

+ 10 - 9
src/views/store/components/userPatietDetails.vue

@@ -176,6 +176,7 @@ export default {
   name: "Patient",
   data() {
     return {
+      orOptions:[],
       show:{
           title:"患者详情",
           open:false,
@@ -234,21 +235,21 @@ export default {
         patientName: [
           { required: true, message: "名称不能为空", trigger: "blur" }
         ],
-        idCard: [
-          { required: true, message: "身份证号不能为空", trigger: "blur" }
-        ],
+        // idCard: [
+        //   { required: true, message: "身份证号不能为空", trigger: "blur" }
+        // ],
         sex: [
           { required: true, message: "性别不能为空", trigger: "blur" }
         ],
-        birthday: [
-          { required: true, message: "生日不能为空", trigger: "blur" }
-        ],
+        // birthday: [
+        //   { required: true, message: "生日不能为空", trigger: "blur" }
+        // ],
         status: [
           { required: true, message: "状态不能为空", trigger: "blur" }
         ],
-        mobile: [
-          { required: true, message: "手机号不能为空", trigger: "blur" },
-        ],
+        // mobile: [
+        //   { required: true, message: "手机号不能为空", trigger: "blur" },
+        // ],
         relation: [
           { required: true, message: '请选择与本人关系', trigger: 'change' }
         ],

+ 10 - 10
src/views/store/components/userStorerDetails.vue

@@ -152,18 +152,18 @@ export default {
       // 表单校验
       rules: {
       },
-       PayOptions:[],
-       orderOptions:[],
-       payStatusOptions:[],
-       refundOptions:[],
-       channelOptions:[],
-       orderTypeOptions:[],
-       deliveryStatusOptions:[],
+      PayOptions:[],
+      orderOptions:[],
+      payStatusOptions:[],
+      refundOptions:[],
+      channelOptions:[],
+      orderTypeOptions:[],
+      deliveryStatusOptions:[],
       deliveryPayStatusOptions:[],
       deliveryTypeOptions:[],
-       tuiOptions:[],
-       orOptions:[],
-       storeOPtions:[],
+      tuiOptions:[],
+      orOptions:[],
+      storeOPtions:[],
     };
   },
   created() {