修改用户管理

src/views/userManagement/userList/index.vue

@@ -26,18 +26,35 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
-            <el-form-item label="注册时间" prop="bookDateRange">
+          <el-col :span="8">
+<!--            <el-form-item label="注册时间" prop="bookDateRange">-->
+<!--              <el-date-picker-->
+<!--                v-model="listQuery.registrationDate "-->
+<!--                type="daterange"-->
+<!--                :editable="true"-->
+<!--                format="yyyy-MM-dd"-->
+<!--                placeholder="请选择注册时间范围">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+
+            <el-form-item label="导入时间">
+              <el-date-picker
+                v-model="listQuery.registrationTimeBegin"
+                type="date"
+                :editable="true"
+                format="yyyy-MM-dd"
+                placeholder="选择日期"
+              ></el-date-picker>~
               <el-date-picker
-                v-model="listQuery.registrationDate "
-                type="daterange"
+                v-model="listQuery.registrationTimeEnd"
+                type="date"
                 :editable="true"
                 format="yyyy-MM-dd"
-                placeholder="请选择注册时间范围">
-              </el-date-picker>
+                placeholder="选择日期"
+              ></el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="4">
             <el-form-item label="用户来源">
               <el-select class="filter-item" v-model="listQuery.source" placeholder="请选用户来源">
                 <el-option :key="undefined" label="无" :value="undefined"></el-option>
@@ -301,7 +318,7 @@
 
 
     <!--    设置会员信息窗口-->
-    <el-dialog title="设置会员信息" :visible.sync="setMemberArea" class="member">
+    <el-dialog title="设置会员信息" @change="change" :visible.sync="setMemberArea" class="member">
       <el-form :model="userMembershipInformation" ref="userMembership" label-width="100px">
         <el-row>
           <el-col :span="16">
@@ -627,7 +644,7 @@
           channel: undefined,
           registrationTimeEnd: undefined,
           registrationTimeBegin: undefined,
-          registrationDate: undefined
+
         },
 
         source: {
@@ -688,8 +705,8 @@
     },
     watch: {
       'userMembershipInformation.memberLevel'(newValue, oldValue) {
-       
-        console.log('userMembershipInformation.memberLevel='+newValue)
+
+        console.log('userMembershipInformation.memberLevel=' + newValue)
       }
     },
     methods: {
@@ -775,7 +792,14 @@
 
         let query = JSON.parse(JSON.stringify(this.listQuery))
         query.source = query.source ? query.source - 1 : ''
-        JSON.stringify(query)
+        console.log('handleFilterStatus:this.listQuery=' + JSON.stringify(this.listQuery))
+        query.registrationTimeBegin =this.listQuery.registrationTimeBegin
+          ?(new Date(query.registrationTimeBegin).getTime()) / 1000:undefined
+        query.registrationTimeEnd = this.listQuery.registrationTimeEnd
+          ? (new Date( query.registrationTimeEnd).getTime()) / 1000:undefined
+
+        console.log('handleFilterEnd:this.listQuery=' + JSON.stringify(this.listQuery))
+        console.log('query================' + JSON.stringify(query))
         appPage(query)
           .then(response => {
             for (let listKey of response.data.list) {
@@ -794,7 +818,7 @@
         listKey.timeOfMembership = listKey.timeOfMembership ? timestamp2Date(listKey.timeOfMembership) : '';
         listKey.recentRecharge = listKey.recentRecharge ? timestamp2Date(listKey.recentRecharge) : '';
         listKey.lastTime = listKey.lastTime ? timestamp2Date(listKey.lastTime) : '';
-        listKey.createTime = listKey.createTime ? timestamp2Date(listKey.createTime) : '';
+        listKey.createTime = listKey.createTime ? timestamp2Date(listKey.createTime*1000) : '';
         listKey.buyCount = listKey.buyCount ? listKey.buyCount : 0;
         listKey.channel = this.terminal[listKey.channel];
         listKey.source = this.source[listKey.source];
@@ -805,9 +829,6 @@
        *查询
        */
       handleFilter() {
-
-        this.listQuery.registrationTimeBegin = this.listQuery.registrationDate ? (new Date(this.listQuery.registrationDate[0]).getTime()) / 1000 : null
-        this.listQuery.registrationTimeEnd = this.listQuery.registrationDate ? (new Date(this.listQuery.registrationDate[1]).getTime()) / 1000 : null
         this.getList();
       }
       ,
@@ -854,8 +875,10 @@
             this.validityType = '无'
           }
           this.userMembershipInformation = response.data
+          // this.userMembershipInformation.memberLevel= this.userMembershipInformation.memberLevel?this.userMembershipInformation.memberLevel:undefined
+
           this.validTime = response.data.validTime
-          console.log(this.userMembershipInformation)
+          console.log('this.userMembershipInformation:'+JSON.stringify(this.userMembershipInformation))
           this.setMemberArea = true
         })
         this.userMembershipInformation.userId = this.saveUserId
@@ -1073,24 +1096,23 @@
       },
       setDate() {
         if (!this.validTime) {
-          let date = new Date();//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+          let date = new Date();
           this.validTime = formatDate(date, 'yyyy-MM-dd hh:mm:ss');
         }
       },
       cleaningQuery() {
-        this.listQuery = {
-          page: 1,
-          limit: 20,
-          mobileList: undefined,
-          mobile: undefined,
-          memberLevel: undefined,
-          source: undefined,
-          channel: undefined,
-          registrationTimeEnd: undefined,
-          registrationTimeBegin: undefined,
-          registrationDate: undefined
-        }
-
+        this.listQuery.page = 1
+        this.listQuery.limit = 20
+          this.listQuery.mobileList = undefined
+          this.listQuery.mobile = undefined
+          this.listQuery.memberLevel = undefined
+          this.listQuery.source = undefined
+          this.listQuery.channel = undefined
+          this.listQuery.registrationTimeEnd = undefined
+          this.listQuery.registrationTimeBegin = undefined
+      },
+      change() {
+        this.$forceUpdate()
       }
     }
   }