zhangdan 4 년 전
부모
커밋
9186939436
2개의 변경된 파일40개의 추가작업 그리고 53개의 파일을 삭제
  1. 25 36
      src/views/CouponSendAuth/user/userList.vue
  2. 15 17
      src/views/CouponSendAuth/user/userModal.vue

+ 25 - 36
src/views/CouponSendAuth/user/userList.vue

@@ -4,19 +4,20 @@
       <a-form layout="inline">
         <a-row :gutter="48">
           <a-col :md="6" :sm="24">
-            <a-form-item label="所在网点" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+            <a-form-item label="所在网点">
               <a-select placeholder="请选择" allowClear v-model="queryParam.tenantId">
                 <a-select-option v-for="item in storeOptionData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
-            <a-form-item label="手机号码,员工姓名">
+            <a-form-item label="手机号码/员工姓名">
               <a-input allowClear v-model.trim="queryParam.queryWord" placeholder="请输入手机号码"/>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" style="margin-right: 10px;">查询</a-button>
+            <a-button @click="reset">重置</a-button>
           </a-col>
         </a-row>
       </a-form>
@@ -34,17 +35,14 @@
       :data="loadData"
       bordered
     >
-      <span slot="status" slot-scope="text, record">
-        <a-switch checkedChildren="" unCheckedChildren="" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
-      </span>
       <div slot="roleNames" slot-scope="text, record" :title="record.roleNames">
         <span v-if="record.roleNames">{{ record.roleNames.substr(0,12) + '...' }}</span>
         <span v-else>无</span>
       </div>
       <!-- 性别 -->
-      <span slot="sex" slot-scope="text">
-        <template v-if="text == 0 ">{{ '男' }}</template>
-        <template v-if="text == 1 ">{{ '女' }}</template>
+      <span slot="sex" slot-scope="text,record">
+        <template v-if="record.sex == 0 ">女</template>
+        <template v-if="record.sex==1">男</template>
       </span>
       <!-- 操作 -->
       <span slot="action" slot-scope="text, record">
@@ -75,7 +73,7 @@ export default {
     return {
       // 查询参数
       queryParam: {
-        tenantId: '',
+        tenantId: undefined,
         queryWord: ''
       },
       showModal: false,
@@ -148,11 +146,6 @@ export default {
       optionAlertShow: false
     }
   },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-      // vm.$refs.table.refresh()
-    })
-  },
   methods: {
     // 刷新列表
     refreshTable () {
@@ -178,9 +171,9 @@ export default {
       })
     },
     // 重置密码
-    resetPassword (row) {
+    resetPassword (record) {
       resetPSD({
-        id: row.id
+        id: record.id
       }).then(res => {
         if (res.status == 200) {
           this.$message.success('密码重置成功')
@@ -192,7 +185,7 @@ export default {
       })
     },
     // 删除
-    delect (row) {
+    delect (record) {
       const _this = this
       this.$confirm({
         title: '警告',
@@ -201,7 +194,7 @@ export default {
         cancelText: '取消',
         onOk () {
           delectUser({
-            id: row.id
+            id: record.id
           }).then(res => {
             if (res.status == 200) {
               _this.$message.success('删除成功')
@@ -223,28 +216,24 @@ export default {
       return str.join(',')
     },
     // 编辑
-    handleEdit (row) {
+    handleEdit (record) {
+      console.log(record)
       this.showModal = true
-      this.itemData = row
+      this.itemData = record
+    },
+    // 重置
+    reset () {
+      this.queryParam = {
+        tenantId: undefined,
+        queryWord: ''
+      }
+      this.refreshTable()
     }
-    // 修改状态
-    // changeFlagHandle (text, record) {
-    //   const _data = {
-    //     id: record.id,
-    //     flag: record.loginFlag ? '1' : '0'
-    //   }
-    //   updateEnableStatus(_data).then(res => {
-    //     if (res.status + '' === '200') {
-    //       this.$message.success('修改成功')
-    //     } else {
-    //       record.loginFlag = !record.loginFlag
-    //     }
-    //   })
-    // }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.getStoreListData()
+      vm.reset()
     })
   }
 }

+ 15 - 17
src/views/CouponSendAuth/user/userModal.vue

@@ -45,8 +45,7 @@
           </a-col>
           <!-- 状态 -->
           <a-col :span="12">
-
-            <a-form-item label="所在网点" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+            <a-form-item label="所在网点" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
               <a-select
                 placeholder="请选择"
                 allowClear
@@ -54,12 +53,11 @@
                   'formData.tenantId',
                   {
                     initialValue: formData.tenantId,
-                    rules: [{ required: true, message: '请选择状态!' }] },
+                    rules: [{ required: true, message: '请选择所在网点!' }] },
                 ]">
                 <a-select-option v-for="item in storeOptionData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-item>
-
           </a-col>
         </a-row>
         <a-row :gutter="24">
@@ -133,11 +131,11 @@ export default {
       form: this.$form.createForm(this, { name: 'miniForm' }),
       roleList: [],
       formData: {
-        roleIds: undefined, // 角色
+        roleIds: [], // 角色
         name: '',
         mobile: '',
         sex: '',
-        tenantId: ''
+        tenantId: undefined
       }
     }
   },
@@ -186,11 +184,11 @@ export default {
       this.form.resetFields()
       delete this.formData.id
       this.formData.roleNames = []
+      this.formData.tenantId = []
       this.formData.name = ''
-      this.formData.loginFlag = ''
-      this.formData.phone = ''
+      this.formData.mobile = ''
       this.formData.sex = ''
-      this.formData.remarks = ''
+      this.formData.roleIds = undefined
     },
 
     // 获取角色列表接口
@@ -221,24 +219,24 @@ export default {
           this.titleText = '编辑用户'
           this.formData = Object.assign({}, this.data)
           delete this.formData.no
-          let roleNames = this.formData.roleNames
-          if (roleNames) {
-            roleNames = roleNames.split(',')
+          let roleIds = this.formData.roleIds
+          if (roleIds) {
+            roleIds = roleIds.split(',')
             const arr = []
-            roleNames.map(item => {
+            roleIds.map(item => {
               const row = this.roleList.find(a => {
-                return a.name == item
+                return a.id == item
               })
               if (row) {
                 arr.push(row.id)
               }
             })
-            this.formData.roleNames = arr
+            this.formData.roleIds = arr
           } else {
-            this.formData.roleNames = []
+            this.formData.roleIds = []
           }
 
-          this.formData.loginFlag = Number(this.formData.loginFlag)
+          // this.formData.loginFlag = Number(this.formData.loginFlag)
         } else {
           this.titleText = '添加用户'
         }