Merge branch 'dev-td' into master-td

src/views/userManagement/memberEnter.vue

@@ -36,18 +36,18 @@
       <el-button class="filter-item"  style="margin-left: 10px;" @click="bulkUpload"
                  type="primary" icon="edit" v-if="memberEnter_btn_addIn">批量导入会员
       </el-button>
-      <el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button>
+      <el-button class="filter-item" v-waves @click="reloadPage">重置</el-button>
     </div>
     <el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
               style="width: 100%">
     <!--<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row-->
               <!--style="width: 100%">-->
-      <el-table-column width="200" align="center" label="手机号">
+      <el-table-column align="center" label="手机号">
         <template slot-scope="scope">
           <span>{{scope.row.username}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="150" align="center" label="会员名">
+      <el-table-column  align="center" label="会员名">
         <template slot-scope="scope">
           <span>{{scope.row.memberName}}</span>
         </template>
@@ -82,8 +82,9 @@
           <span>{{scope.row.crtName}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="操作" width="65" fixed="right">
+      <el-table-column align="center" label="操作" fixed="right">
         <template slot-scope="scope">
+          <el-button class="el-button el-button--text el-button--small" size="small" v-if="scope.row.status!=1 && memberEnter_btn_upd" @click="editHandler(scope.row)">编辑</el-button>
           <el-button class="el-button el-button--text el-button--small" style="color:red" size="small" @click="deleteHandler(scope.row)" v-if="memberEnter_btn_del&&scope.row.status!=1">删除</el-button>
         </template>
       </el-table-column>
@@ -96,7 +97,7 @@
     </div>
 
     <!--    新建会员窗口-->
-    <el-dialog title="新建会员" :visible.sync="newMemberArea">
+    <el-dialog :title="title" :visible.sync="newMemberArea">
       <el-form :model="newMemberObject" :rules="newMemberObjectVerify" ref="nmo" label-width="100px">
 
 				<el-row>
@@ -193,7 +194,7 @@
   </div>
 </template>
 
-<script>
+<script type="javascript">
   import {
     getMemberEntryList,
     delMemberObj
@@ -249,6 +250,7 @@
         listLoading: true,
         orderListLoading: true,
         newMemberObject: {
+          id: undefined,
           memberName:undefined,
 					memberType:undefined,
           phone: undefined,
@@ -263,6 +265,7 @@
           type: undefined,
           status: undefined
         },
+        title: '新增会员',
         newMemberObjectVerify: {
           phone: [
             {
@@ -310,12 +313,15 @@
         tableKey: 0,
         selectedAccItem: undefined,
         memberEnter_btn_add: false,//添加一条
+        memberEnter_btn_upd: false, // 编辑
         memberEnter_btn_del:false,//删除
         memberEnter_btn_addIn: false,//批量上传
       }
     },
     created() {
       this.memberEnter_btn_add=this.elements['memberEnter:btn_add'];//添加一条
+      this.memberEnter_btn_upd=this.elements['memberEnter:btn_upd'];//编辑一条
+
       this.memberEnter_btn_del=this.elements['memberEnter:btn_del'];//删除
       this.memberEnter_btn_addIn=this.elements['memberEnter:btn_addIn'];//批量上传
 
@@ -378,6 +384,22 @@
             this.getList();
           })
       },
+      /**
+       * 编辑
+       */
+      editHandler(row){
+        this.title = '编辑会员'
+        this.newMemberObject = {
+          id: row.id,
+          memberName: row.memberName,
+          memberType: row.memberType,
+          phone: row.username,
+          memberLevel: row.memberLevel,
+          totalNumber: row.totalNumber,
+          rentFreeDays: row.rentFreeDays
+        }
+        this.newMemberArea = true
+      },
       /**
        * 删除
        * */
@@ -535,10 +557,19 @@
        * @param row
        */
       newMember() {
+        this.title = '新增会员'
+        this.newMemberObject = {
+          memberName:undefined,
+          memberType:undefined,
+          phone: undefined,
+          memberLevel: undefined,
+          totalNumber: undefined,
+          rentFreeDays: undefined
+        }
         this.newMemberArea = true
       },
       /**
-       * 提交新增会员
+       * 提交新增会员/编辑会员
        */
       setNewMemberObject(formName) {
        console.log(JSON.stringify(this.newMemberObject))
@@ -551,12 +582,12 @@
           .then(res => {
               if (res.rel) {
                 this.$notify.success({
-                  title: '新增成功',
+                  title: '操作成功',
                   message: `success`
                 })
               } else {
                 this.$notify.warning({
-                  title: '新增失败',
+                  title: '操作失败',
                   message: `failed`
                 })
               }