Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/system/cardAndCouponManager/vipManager/activateVip.vue

@@ -202,6 +202,7 @@ export default {
         })
         return
       }
+      var that = this
       this.VipCharge({
         code: this.vip.VipCardChildCode,
         tel: this.customer.Phone,
@@ -212,6 +213,10 @@ export default {
           type: 'success',
           message: '激活成功！',
         })
+        setTimeout(() => {
+          that.setNull()
+          that.centerDialogVisible = false
+        }, 1000)
       })
     },
   },

src/pages/system/channelManager/channelList/add.vue

@@ -3,7 +3,7 @@
     <form class="mainForm">
       <ul>
         <li class="flex-h">
-          <!-- <span>选择案场：</span> -->
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="CaseId" placeholder="请选择">

src/pages/system/channelManager/channelList/edit.vue

@@ -3,7 +3,7 @@
     <form class="mainForm">
       <ul>
         <li class="flex-h">
-          <!-- <span>选择案场：</span> -->
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="CaseId" placeholder="请选择">

src/pages/system/courseManager/courseList/add.vue

@@ -323,10 +323,12 @@ export default {
         if (!this.detail.CaseId || this.detail.CaseId === '') {
           this.detail.CaseId = this.caseid
         }
-        this.AddCourse(this.detail)
+        this.AddCourse({...this.detail, callback: _that.afterSave})
       } else {
-        this.UpdateCourse(this.detail)
+        this.UpdateCourse({...this.detail, callback: _that.afterSave})
       }
+    },
+    afterSave () {
       this.$message({
         type: 'success',
         message: '操作成功'

src/pages/system/goodsManager/goodsSpecManager/add.vue

@@ -15,7 +15,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <!-- <span>选择案场：</span> -->
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="CaseId" placeholder="请选择">

src/pages/system/goodsManager/goodsSpecManager/edit.vue

@@ -15,7 +15,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <!-- <span>选择案场：</span> -->
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="CaseId" placeholder="请选择">

src/pages/system/systemSet/roleManager/index.vue

@@ -79,9 +79,11 @@ export default {
     }),
     defaultChecked: {
       get () {
-        const sels = (this.roleMenus || []).map(x => x.MenuId)
-        console.log(sels)
-        return sels
+        if (this.roleMenus.length && this.roleMenus.length > 0) {
+          const sels = (this.roleMenus || []).map(x => x.MenuId)
+          return sels
+        }
+        return []
       },
     },
   },
@@ -99,11 +101,9 @@ export default {
       return this.toolClass.dateFormat(date)
     },
     handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
     },
     handleCurrentChange (val) {
       this.GetRolesList({ page: val })
-      console.log(`当前页: ${val}`)
     },
     handleEdit (index, row) {
       // 编辑
@@ -140,7 +140,6 @@ export default {
       this.dialogTableVisible = true
     },
     handleNodeClick (node) {
-      console.log(node)
     },
     searchList (key) {
       this.key = key
@@ -150,8 +149,7 @@ export default {
       this.$router.push({ name: 'editRole' })
     },
     getCheckedNodes () { // 获取选中的节点
-      const menuids = this.$refs.tree.getCheckedNodes().map(x => x.id).join(',')
-      console.log(menuids)
+      const menuids = (this.$refs.tree.getCheckedNodes() || []).map(x => x.id).join(',')
       this.SaveRoleMenus({
         id: this.selid,
         menuids: menuids,

src/pages/system/systemSet/userManager/add.vue

@@ -23,7 +23,7 @@
                 :action='$api.file.image.url'
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
-                <img v-if="postData.HeadImgUrl" :src="postData.HeadImgUrl" class="avatar">
+                <img v-if="postData.Headimgurl" :src="postData.Headimgurl" class="avatar">
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
@@ -59,7 +59,7 @@
             <div style="width:50%">
               <el-input
                 placeholder="请输入工号"
-                v-model="postData.workNo"
+                v-model="postData.WorkNo"
                 clearable>
               </el-input>
             </div>
@@ -145,7 +145,7 @@ export default {
         WorkNo: '', // 工号
         Email: '', // 邮箱
         Phone: '', // 手机号
-        HeadImgUrl: '', // 头像
+        Headimgurl: '', // 头像
         TypeId: '', // 用户类型id
         TagIds: '', // 用户标签
         BelongCaseId: '', // 所属案场id
@@ -192,7 +192,7 @@ export default {
       this.postData.TagIds = val.join(',')
     },
     handleAvatarSuccess (res, file) {
-      this.postData.HeadImgUrl = res.result.url
+      this.postData.Headimgurl = res.result.url
     },
     submit () { // 提交数据
       if (this.postData.UserName === '') {

src/pages/system/systemSet/userManager/edit.vue

@@ -23,7 +23,7 @@
                 :action='$api.file.image.url'
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
-                <img v-if="postData.HeadImgUrl" :src="postData.HeadImgUrl" class="avatar">
+                <img v-if="postData.Headimgurl" :src="postData.Headimgurl" class="avatar">
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
@@ -59,7 +59,7 @@
             <div style="width:50%">
               <el-input
                 placeholder="请输入工号"
-                v-model="postData.workNo"
+                v-model="postData.WorkNo"
                 clearable>
               </el-input>
             </div>
@@ -105,7 +105,7 @@
         <li class="flex-h">
           <span>选择案场：</span>
           <div class="flex-item">
-            <el-select v-model="CaseId" placeholder="请选择">
+            <el-select v-model="BelongCaseId" placeholder="请选择">
               <el-option
                 v-for="item in cases"
                 :key="item.CaseId"
@@ -145,10 +145,11 @@ export default {
         WorkNo: '', // 工号
         Email: '', // 邮箱
         Phone: '', // 手机号
-        HeadImgUrl: '', // 头像
+        Headimgurl: '', // 头像
         TypeId: '', // 用户类型id
         TagIds: '', // 用户标签
-        BelongCaseId: '', // 所属案场id
+        BelongCaseId: '',
+        UserCase: [],
       }
     }
   },
@@ -158,9 +159,9 @@ export default {
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default,
     }),
-    CaseId: {
+    BelongCaseId: {
       get () {
-        return this.postData.BelongCaseId || this.defaultCaseId
+        return ((this.postData.UserCase || []).filter(x => x.IsBelong === 1)[0] || {}).CaseId
       },
       set (val) {
         this.postData.BelongCaseId = val
@@ -209,7 +210,7 @@ export default {
       this.postData.TagIds = val.join(',')
     },
     handleAvatarSuccess (res, file) {
-      this.postData.HeadImgUrl = res.result.url
+      this.postData.Headimgurl = res.result.url
     },
     submit () { // 提交数据
       if (this.postData.UserName === '') {
@@ -234,7 +235,7 @@ export default {
         })
         return false
       }
-      if (this.postData.BelongCaseId === '') this.postData.BelongCaseId = this.CaseId
+      if (this.postData.BelongCaseId === '') this.postData.BelongCaseId = this.BelongCaseId
       if (this.postData.TagIds === '') this.postData.TagIds = this.TagIds.join(',')
       this.$ajax(this.$api.systemSet.editUser.url, {
         method: this.$api.systemSet.editUser.method,