t

src/api/user.js

@@ -49,4 +49,7 @@ export default {
   admdeptdel: params => { // 渠道 -  删除
     return getRequestNoSort('/adm/dept/del', params, 'loading')
   },
+  admuserenrolledit: params => { // 编辑活动的用户备注
+    return getRequestNoSort('/adm/user/enroll/edit', params, 'loading')
+  },
 }

src/views/activity/components/popup/UremarkEdit.vue

@@ -0,0 +1,88 @@
+<template>
+  <div>
+    <el-dialog
+      v-loading="loading"
+      :show-close="false"
+      :close-on-click-modal="false"
+      :visible.sync="isShow"
+      :title="`修改备注：${curObj.info2}(${curObj.info3})`"
+      :fullscreen="false"
+      width="360px"
+      custom-class="xl-dialog"
+      center
+    >
+      <base-form ref="ruleForm" :data="formData" :is-inline="false" label-width="100px">
+        <div slot="footer">
+          <el-button class="xl-form-btn t2" @click="close">关 闭</el-button>
+          <el-button class="xl-form-btn t1" @click="close('confirm')">确定</el-button>
+        </div>
+      </base-form>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  components: {},
+  mixins: [...mixins],
+  props: {
+    isShow: Boolean,
+    curObj: Object
+  },
+  inject: ['parentData'],
+  data() {
+    return {
+      formData: [],
+      loading: true,
+      cObj: {},
+      isShowMap: false
+    }
+  },
+  watch: {
+    isShow: function(val) {
+      if (val) {
+        this.getDef()
+      }
+    },
+  },
+  methods: {
+    getDef(fieldStr) {
+      let params = { ...this.curObj }
+      if (fieldStr === 'changeStr') {
+        const oldform = this.$refs.ruleForm.baseForm
+        params = {...this.curObj, ...oldform}
+      } else {
+        params.auth_state = '1'
+      }
+      this.formData = [
+        { label: '活动备注', key: 'enroll_remark' },
+      ]
+      this.setDefaultValue(params)
+    },
+    groupTypeChange () {
+      this.getDef('changeStr')
+    },
+    close(str) {
+      if (str === 'confirm') {
+        this.$refs['ruleForm'].$refs['baseForm'].validate((valid) => {
+          if (valid) {
+            const oldform = this.$refs.ruleForm.baseForm
+            const newForm = { ...oldform }
+            if (this.curObj.user_id) newForm.user_id = this.curObj.user_id
+            let apiStr = 'admuserenrolledit'
+            if (newForm.user_id) apiStr = 'admuserenrolledit'
+            this.$api.user[apiStr](newForm).then(data => {
+              this.$msgs(newForm.id ? '编辑成功' : '新增成功')
+              this.$emit('close', newForm)
+            })
+          }
+        })
+      } else {
+        this.$emit('close')
+        this.setDefaultValue()
+      }
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+</style>

src/views/activity/dtl.vue

@@ -10,23 +10,23 @@
       :totalRecords="totalRecords"
       @currentChange="pageHandle"
     />
-    <!-- <dict-edit
+    <uremark-edit
       :isShow="isPopupShow"
       :curObj="curObj"
       @close="closePopup"
-    /> -->
+    />
   </div>
 </template>
 <script>
 // import { arrToObj } from '@/utils'
 import SearchForm from './components/searchForm/Dtl'
-// import DictEdit from './components/popup/DictDtlEdit'
+import UremarkEdit from './components/popup/UremarkEdit'
 import baseTable from '_m/baseTable.js'
 export default {
   // name: 'basePublicDictSys',
   components: {
     SearchForm,
-    // DictEdit
+    UremarkEdit
   },
   provide () {
     return {
@@ -59,6 +59,7 @@ export default {
     if (query.t == 2) {
       this.listConfig = {
         rows: [
+          { label: '用户备注', prop: 'enroll_remark' },
           { label: '报备次数', prop: 'report_count' },
           { label: '签到时间', prop: 'sign_at' },
           { label: '公司/门店', prop: 'info1' },
@@ -71,6 +72,7 @@ export default {
     } else {
       this.listConfig = {
         rows: [
+          { label: '用户备注', prop: 'enroll_remark' },
           { label: '报备次数', prop: 'report_count' },
           { label: '签到时间', prop: 'sign_at' },
           { label: '抖音名', prop: 'info1' },
@@ -82,27 +84,13 @@ export default {
           { label: '粉丝数量', prop: 'info6' },
           { label: '获赞数量', prop: 'info7' },
           { label: '所属区域', prop: 'info8' },
-          // { label: '更新人', prop: 'update_by' },
           { label: '更新时间', prop: 'update_at' },
-          // { label: '状态', prop: 'status', type: 'tag', tags: arrToObj(this.$dictData.dictStatus), tagTypeObj: {'1': 'success', '2': 'danger'} },
-          // { label: '操作', width: 200, type: 'handle2',
-          //   operations: [
-          //     // { labelFor: 'status', disabled: true, func: this.statusHandle, hide: 'nosys',
-          //     //   labelConfig: {
-          //     //     texts: {
-          //     //       1: '停用',
-          //     //       2: '启用'
-          //     //     },
-          //     //     btnTypes: {
-          //     //       1: 'danger',
-          //     //       2: 'success'
-          //     //     }
-          //     //   }
-          //     // },
-          //     { label: '编辑', func: this.openPopup, btnType: 'primary' },
-          //     { label: '删除', func: this.delHandle, btnType: 'danger', hide: 'nosys' },
-          //   ]
-          // }
+          { label: '备注', prop: 'remark' },
+          { label: '操作', width: 80, type: 'handle2',
+            operations: [
+              { label: '编辑备注', func: this.openPopup, btnType: 'primary' },
+            ]
+          }
         ]
       }
     }

src/views/user/components/popup/IndexEdit.vue

@@ -75,6 +75,7 @@ export default {
             remoteParams: { skey: 'estate_name', api: `house.admestatelist`, opKey: 'estate_name', opVal: 'id' },
             remoteOptions: [{ keyRO: params.estate_name, valRO: params.estate_id }]
           },
+          { label: '活动备注', key: 'enroll_remark' },
         ]
       } else {
         this.formData = [
@@ -94,6 +95,7 @@ export default {
             remoteParams: { skey: 'estate_name', api: `house.admestatelist`, opKey: 'estate_name', opVal: 'id' },
             remoteOptions: [{ keyRO: params.estate_name, valRO: params.estate_id }]
           },
+          { label: '活动备注', key: 'enroll_remark' },
         ]
       }
       this.setDefaultValue(params)