+
- {{ unit.name }}
+
+ {{ unit.name }}
+
@@ -109,7 +153,7 @@ export default {
v-if="item.groupId === selectedGroup || !selectedGroup"
:label="item"
:key="index"
- >{{ item.name }}{{ item.name.trim() || '(空的无效标签，请移除)' }}
diff --git a/linkwe-ui/src/components/SelectUser.vue b/linkwe-ui/src/components/SelectUser.vue
index 1586b40de6b5d4ab182346cac32debc4f5ea88f2..6ece4679f2a90435207fc5f4f0ed531fea891c37 100644
--- a/linkwe-ui/src/components/SelectUser.vue
+++ b/linkwe-ui/src/components/SelectUser.vue
@@ -84,14 +84,23 @@ export default {
},
// 选择变化
handleCheckChange(data, checked, indeterminate) {
+ // debugger
if (checked) {
if (this.isSigleSelect) {
// 单选情况
this.$refs.tree.setCheckedKeys([data.key])
}
- this.userList.push(data)
+ if (this.isOnlyLeaf) {
+ if (data.userId) {
+ this.userList.push(data)
+ }
+ } else {
+ this.userList.push(data)
+ }
} else {
- this.userList.splice(this.userList.indexOf(data), 1)
+ let index = this.userList.indexOf(data)
+
+ index > -1 && this.userList.splice(index, 1)
}
// console.log(data, checked, indeterminate);
},
diff --git a/linkwe-ui/src/components/Upload.vue b/linkwe-ui/src/components/Upload.vue
index 4f0f473b4df442b57192f632e756b9af6af63c9f..870af0e6e27623dc631d615fd3f7338dc567ae8f 100644
--- a/linkwe-ui/src/components/Upload.vue
+++ b/linkwe-ui/src/components/Upload.vue
@@ -30,9 +30,11 @@ export default {
loading: false,
action:
process.env.VUE_APP_BASE_API +
- '/common/uploadFile2Cos',
+ (this.type == 0
+ ? '/wecom/material/uploadimg'
+ : '/common/uploadFile2Cos'),
headers: window.CONFIG.headers,
- domain: process.env.VUE_APP_BASE_API
+ domain: process.env.VUE_APP_BASE_API,
}
},
watch: {},
@@ -103,8 +105,13 @@ export default {
this.loading = false
// this.$emit('update:fileUrl', res.data.materialUrl)
// this.$emit('update:fileName', res.data.materialName)
+ if (this.type == 0) {
+ res.url = res.data.url
+ res.fileName = res.data.url
+ }
this.$emit('update:fileUrl', res.url)
this.$emit('update:fileName', res.fileName)
+ this.$emit('update:file', file)
// this.fileUrl = URL.createObjectURL(file.raw)
}
},
diff --git a/linkwe-ui/src/config.js b/linkwe-ui/src/config.js
index 0cf0bb032aae59e1796aad20dd82cce0e12481bf..3f06d2808c879df426ea5ccc587ae969f4cc1ea9 100644
--- a/linkwe-ui/src/config.js
+++ b/linkwe-ui/src/config.js
@@ -34,6 +34,13 @@ window.CONFIG = {
common: '/common',
},
+ /**
+ * 前端生成群活码跳转的H5链接
+ * 由于群活码是由前端生成，需要配置一下群活码跳转的链接
+ * 例如: http://xxx.xxx.xx/h5/groupCode
+ */
+ groupCodeH5Link: 'http://linkwechat.cn/mobile/#/groupCode',
+
get headers() {
return { Authorization: 'Bearer ' + getToken() }
},
diff --git a/linkwe-ui/src/directive/permission/index.js b/linkwe-ui/src/directive/index.js
similarity index 48%
rename from linkwe-ui/src/directive/permission/index.js
rename to linkwe-ui/src/directive/index.js
index e3d76d387336c3c780c5adcef918c3114fb4a8d0..7906f5bdba589f164a76357ff5e3ba3f0c0fa337 100644
--- a/linkwe-ui/src/directive/permission/index.js
+++ b/linkwe-ui/src/directive/index.js
@@ -1,15 +1,17 @@
-import hasRole from './hasRole'
-import hasPermi from './hasPermi'
+import hasRole from './permission/hasRole'
+import hasPermi from './permission/hasPermi'
+import preventReClick from './preventReClick'
const install = function(Vue) {
Vue.directive('hasRole', hasRole)
Vue.directive('hasPermi', hasPermi)
+ Vue.directive('preventReClick', preventReClick)
}
if (window.Vue) {
window['hasRole'] = hasRole
window['hasPermi'] = hasPermi
- Vue.use(install); // eslint-disable-line
+ Vue.use(install) // eslint-disable-line
}
export default install
diff --git a/linkwe-ui/src/directive/preventReClick.js b/linkwe-ui/src/directive/preventReClick.js
new file mode 100644
index 0000000000000000000000000000000000000000..87c7b29f8bf80bd78a7e85880c528e65db6e18b5
--- /dev/null
+++ b/linkwe-ui/src/directive/preventReClick.js
@@ -0,0 +1,14 @@
+/**
+ * vue 自定义阻止按钮连续点击指令
+ * 使用
搜索
+ */
+export default {
+ inserted(el, binding) {
+ el.addEventListener('click', () => {
+ el.style.pointerEvents = 'none'
+ setTimeout(() => {
+ el.style.pointerEvents = 'auto'
+ }, binding.value || 2000)
+ })
+ },
+}
diff --git a/linkwe-ui/src/layout/components/AppMain.vue b/linkwe-ui/src/layout/components/AppMain.vue
index 70b095862a6e5f37ac44fdf1f0577c6a7c021854..bdcf91b40aa5dde1589b9b064de56358b876ccb6 100644
--- a/linkwe-ui/src/layout/components/AppMain.vue
+++ b/linkwe-ui/src/layout/components/AppMain.vue
@@ -6,34 +6,34 @@
diff --git a/linkwe-ui/src/views/appTool/task/list.vue b/linkwe-ui/src/views/appTool/task/list.vue
index ea8caafc66ad30017d01de2cdae040b576453a6d..1dd75ad460a7036f03323332fe231d84971010f8 100644
--- a/linkwe-ui/src/views/appTool/task/list.vue
+++ b/linkwe-ui/src/views/appTool/task/list.vue
@@ -38,7 +38,7 @@ export default {
},
methods: {
getList(page) {
- if (this.dateRange[0]) {
+ if (this.dateRange) {
this.query.beginTime = this.dateRange[0]
this.query.endTime = this.dateRange[1]
} else {
diff --git a/linkwe-ui/src/views/application/fissionDetail/addFission.vue b/linkwe-ui/src/views/application/fissionDetail/addFission.vue
new file mode 100644
index 0000000000000000000000000000000000000000..56f48f145aae5215c228c3c886000218a29709ce
--- /dev/null
+++ b/linkwe-ui/src/views/application/fissionDetail/addFission.vue
@@ -0,0 +1,600 @@
+
+
+
+
+
+
基本信息设置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
选择客户群
+
+
+
+ 全部
+ 选择群主
+
+
+ {{ item.staffName }}
+
+
+
+ 选择群主
+
+
+
+ 选择标签
+
+
+
+
+
裂变海报
+
+
+ 选择海报
+
+
![]()
+
修改
+
+
![]()
+
修改
+
+
+
+
活动奖励
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
{{
+ pageType == 'edit' ? '立即修改' : '立即创建'
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/linkwe-ui/src/views/application/fissionDetail/index.vue b/linkwe-ui/src/views/application/fissionDetail/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..4d9fadbc0f681044e48cfad2cc4aff1cfd1579c9
--- /dev/null
+++ b/linkwe-ui/src/views/application/fissionDetail/index.vue
@@ -0,0 +1,287 @@
+
+
+
+
+
+
任务活动信息
+
+
创建人:
+
{{ taskDetail.createBy }}
+
+
+
活动名称:
+
{{ taskDetail.taskName }}
+
+
+
裂变引导语:
+
{{ taskDetail.fissInfo }}
+
+
+
裂变客户数量:
+
{{ taskDetail.fissNum }}人
+
+
+
活动时间:
+
+ {{ taskDetail.startTime }}至{{ taskDetail.overTime }}
+
+
+
+
+
裂变海报:
+
![]()
+
+
+
群活码:
+
![]()
+
+
+
+
兑奖链接:
+
{{ taskDetail.rewardUrl }}
+
+
+
兑奖图片:
+
![]()
+
+
+
新客欢迎语:
+
{{ taskDetail.welcomeMsg }}
+
+
+
+
关键数据
+
+
+ 近7日
+ 近30日
+
+
+
+
+
+
+
+
diff --git a/linkwe-ui/src/views/application/groupFission.vue b/linkwe-ui/src/views/application/groupFission.vue
new file mode 100644
index 0000000000000000000000000000000000000000..5ec1c3c3cc95fe80ad89a1397233bc370c5e4efc
--- /dev/null
+++ b/linkwe-ui/src/views/application/groupFission.vue
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 新增任务
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.fissStatus===1?'进行中':'已结束' }}
+
+
+
+
+ {{ scope.row.startTime}}-{{scope.row.overTime}}
+
+
+
+
+ 查看
+ 编辑
+
+
+
+
+
+
+
diff --git a/linkwe-ui/src/views/application/taskDetail/addTask.vue b/linkwe-ui/src/views/application/taskDetail/addTask.vue
new file mode 100644
index 0000000000000000000000000000000000000000..ebee74d0428db32d0e8771d29e8b0d607b6458f4
--- /dev/null
+++ b/linkwe-ui/src/views/application/taskDetail/addTask.vue
@@ -0,0 +1,589 @@
+
+
+
+
+
+
基本信息设置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
活动发起成员
+
+
+
+ 全部
+ 选择成员
+
+
+ {{ item.staffName }}
+
+
+
+ 选择成员
+
+
+
+ 全部
+ 选择标签
+
+
+ {{
+ item
+ }}
+
+
+
+ 选择标签
+
+
+
+
+
裂变海报
+
+
+ 选择海报
+
+
![]()
+
修改
+
+ {{ groupForm.fissionTarget }}
+ 修改
+
+
+ 选择员工，用于此次任务裂变的目标添加人。如不选择将默认使用本次活动下发员工的活码信息。
+
+
+
+
+
+
活动奖励
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
{{
+ pageType == 'edit' ? '立即修改' : '立即创建'
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/linkwe-ui/src/views/application/taskDetail/editTask.vue b/linkwe-ui/src/views/application/taskDetail/editTask.vue
new file mode 100644
index 0000000000000000000000000000000000000000..1cc32dd59d219ecdd0e53ec2473f3f99b3e99b3a
--- /dev/null
+++ b/linkwe-ui/src/views/application/taskDetail/editTask.vue
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
diff --git a/linkwe-ui/src/views/application/taskDetail/index.vue b/linkwe-ui/src/views/application/taskDetail/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..ee452bb7922de6e4ded5307e89b45ffc524c2354
--- /dev/null
+++ b/linkwe-ui/src/views/application/taskDetail/index.vue
@@ -0,0 +1,269 @@
+
+
+
+
+
+
任务活动信息
+
+
创建人:
+
{{taskDetail.createBy}}
+
+
+
活动名称:
+
{{taskDetail.taskName}}
+
+
+
裂变引导语:
+
{{taskDetail.fissInfo}}
+
+
+
裂变客户数量:
+
{{taskDetail.fissNum}}人
+
+
+
活动时间:
+
{{taskDetail.startTime}}至{{taskDetail.overTime}}
+
+
+
+
客户标签:
+
{{taskDetail.customerTag}}
+
+
+
裂变海报:
+
![]()
+
+
+
员工:
+
{{taskDetail.fissionTarget}}
+
+
+
+
兑奖链接:
+
{{taskDetail.rewardUrl}}
+
+
+
兑奖图片:
+
![]()
+
+
+
新客欢迎语:
+
{{taskDetail.welcomeMsg}}
+
+
+
+
+
+
diff --git a/linkwe-ui/src/views/application/taskGroup.vue b/linkwe-ui/src/views/application/taskGroup.vue
new file mode 100644
index 0000000000000000000000000000000000000000..a518b30708b3cd9243f6851ab75179df97c4db85
--- /dev/null
+++ b/linkwe-ui/src/views/application/taskGroup.vue
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 新增任务
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.fissStatus===1?'进行中':'已结束' }}
+
+
+
+
+ {{ scope.row.startTime}}-{{scope.row.overTime}}
+
+
+
+
+ 查看
+ 编辑
+
+
+
+
+
+
+
diff --git a/linkwe-ui/src/views/communityOperating/groupSOP/aev.vue b/linkwe-ui/src/views/communityOperating/groupSOP/aev.vue
index 4a406c8e4952ace9759f181fcaf6ef9239b511f3..b64bcae4f0a534a0be3f514f01688af1e69078e7 100644
--- a/linkwe-ui/src/views/communityOperating/groupSOP/aev.vue
+++ b/linkwe-ui/src/views/communityOperating/groupSOP/aev.vue
@@ -1,22 +1,498 @@
+
+
+
+
+
+
+
+
+ {{ group.groupName }}
+ {{ customerGroups.length ? '修改' : '添加' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
新建素材
+
+
+
+ 文本
+
+
+
+
+ {{ text.content }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 从素材库选择
+
+
+
+
+
+
欢迎语样式
+
+
+
+
+
+
+
+ {{ text }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+ .overflow-ellipsis {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
diff --git a/linkwe-ui/src/views/communityOperating/groupSOP/list.vue b/linkwe-ui/src/views/communityOperating/groupSOP/list.vue
index 3dd49c142e5627477d85459972809a8182c010bd..2427b97af088ff60b9ee6bb8d10f4d1de471e509 100644
--- a/linkwe-ui/src/views/communityOperating/groupSOP/list.vue
+++ b/linkwe-ui/src/views/communityOperating/groupSOP/list.vue
@@ -1,136 +1,99 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
- 群SOP 制定推送规则后，通知群主定时给指定客户群发送消息。
+ 新建规则
- 创建规则批量删除
-
-
-
-
+
+
+
-
- {{
- Math.floor(Math.random() * 10000)
- }}
+ >
+
+
+
+
+ {{ getDisplayGroups(row) }}
+
+
+
+
+
+
查看删除
编辑
@@ -164,74 +127,132 @@ export default {
:limit.sync="query.pageSize"
@pagination="getList()"
/>
-
-
-
-
-
-
-
-
- 如何获取？
-
-
-
-
- 如何获取？
-
-
-
- 如何获取？
-
-
-
-
-
-
-
-
-
-
-
- 取 消
- 确 定
-
-
+
+
+
+
diff --git a/linkwe-ui/src/views/communityOperating/keywords/aev.vue b/linkwe-ui/src/views/communityOperating/keywords/aev.vue
index 799de23a704d39ecbfc4bf9dd2a59df380619f78..cdcdfb31c7f08d25035773692b41404fedd24940 100644
--- a/linkwe-ui/src/views/communityOperating/keywords/aev.vue
+++ b/linkwe-ui/src/views/communityOperating/keywords/aev.vue
@@ -1,22 +1,204 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ groupQrCode && groupQrCode.codeUrl ? '修改' : '添加' }}
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+ .welcome-input {
+ display: table;
+ width: 80%;
+ margin: 0 auto 20px;
+ }
+
diff --git a/linkwe-ui/src/views/communityOperating/keywords/list.vue b/linkwe-ui/src/views/communityOperating/keywords/list.vue
index 6c3da6688ad70cf0cdafc1c5ca5bee5d7b8d3f33..ffd0da05079f6ff82686c9ba209f1d630573772c 100644
--- a/linkwe-ui/src/views/communityOperating/keywords/list.vue
+++ b/linkwe-ui/src/views/communityOperating/keywords/list.vue
@@ -1,147 +1,176 @@
-
-
+
+
+
+ 请点击按钮复制该应用链接，并将应用页面配置到聊天工具栏，方便成员在与客户的聊天中查看和使用，提高服务效率
+
+
+
+
+
+ {{ h5Link }}
+
+
+
+
+ 复制地址
+ 如何配置？
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
- 关键词拉群
- 配置聊天工具栏，管理员创建关键词拉群后，员工可在聊天功能栏使用。
+ 新建关键词
- 新建关键词拉群批量下载 -->
+ 批量删除
-
-
-
-
+
+
-
- {{
- Math.floor(Math.random() * 10000)
- }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ getDisplayKeywords(row) }}
+
+
-
- 已结束
+
+
+
+
+ {{ getDisplayRealGroups(row) }}
+
+
+
+
+
编辑
+
编辑删除
@@ -177,73 +213,258 @@ export default {
@pagination="getList()"
/>
-
-
-
-
-
-
-
- 如何获取？
-
-
-
-
- 如何获取？
-
-
-
- 如何获取？
-
-
-
-
-
-
-
-
-
-
+
+
+
+
1、登录企业微信官方后台，进入应用管理，点击 LinkWeChat，再点击【配置到聊天工具栏】。
+
+
+
+
+
+
+
3、点击【配置页面】后，在弹窗中，输入页面名称及链接，并确定即可。进入配置页面。
+
+
+
- 取 消
- 确 定
+ 我知道了
+
+
+
+
diff --git a/linkwe-ui/src/views/communityOperating/newCustomer/aev.vue b/linkwe-ui/src/views/communityOperating/newCustomer/aev.vue
index b093f63471c4639ea44d39403d9789e502eba9c6..fd45adb6841392b234089cad23f40754e0ccb318 100644
--- a/linkwe-ui/src/views/communityOperating/newCustomer/aev.vue
+++ b/linkwe-ui/src/views/communityOperating/newCustomer/aev.vue
@@ -1,22 +1,305 @@
+
+
+
+
+
+
+
+
+ {{ user.businessName }}
+ {{ users.length ? '修改' : '添加' }}
+
+
+
+
+
+
+
+
+
+ {{ groupQrCode && groupQrCode.codeUrl ? '修改' : '选择' }}
+
+
+
+ {{ tag.tagName }}
+ 添加标签
+
+
+
+ 客户添加时无需经过确认自动成为好友
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ methods: {
+ /** 获取详情 */
+ getDetail(id) {
+ this.loading = true
+ getDetail(id).then(({ data }) => {
+ this.form.codeName = data.codeName || ''
+ this.form.skipVerify = data.skipVerify || 0
+ this.form.welcomeMsg = data.welcomeMsg || ''
-
-
-
-
+ if (data.groupCodeInfo && data.groupCodeInfo.id) {
+ this.codes = [ data.groupCodeInfo ]
+ this.groupQrCode = data.groupCodeInfo
+ this.form.groupCodeId = data.groupCodeInfo.id
+ } else {
+ this.codes = []
+ this.groupQrCode = {}
+ this.form.groupCodeId = ''
+ }
+
+ this.tags = data.tagList || []
+ this.users = data.emplList || []
+
+ this.loading = false
+ })
+ },
+
+ // 选择人员变化事件
+ submitSelectUser (users) {
+ this.users = users.map((d) => {
+ return {
+ businessId: d.id || d.userId,
+ businessName: d.name,
+ businessIdType: d.userId ? 2 : 1,
+ mobile: d.mobile,
+ empleCodeId: d.empleCodeId
+ }
+ })
+ },
+
+ submitSelectTag (tags) {
+ this.tags = tags.map((t) => {
+ return {
+ tagId: t.tagId,
+ tagName: t.name
+ }
+ })
+ },
+
+ // 选择二维码确认按钮
+ submitSelectQrCode (data) {
+ this.groupQrCode = data
+ this.form.groupCodeId = data.id
+ },
+
+ submit() {
+ if (!this.users.length) {
+ this.msgError('请至少选择一名使用员工')
+ return
+ }
+
+ if (!this.form.groupCodeId) {
+ this.msgError('请选择一个群活码')
+ return
+ }
+
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ this.loading = true
+ if (this.newGroupId) {
+ update(this.newGroupId, this.form).then(() => {
+ this.msgSuccess('更新成功')
+ this.loading = false
+ this.$router.back()
+ }).catch(() => {
+ this.loading = false
+ })
+ } else {
+ add(this.form).then(() => {
+ this.msgSuccess('添加成功')
+ this.loading = false
+ this.$router.back()
+ }).catch(() => {
+ this.loading = false
+ })
+ }
+ }
+ })
+ }
+ },
+
+ watch: {
+ tags (tags) {
+ this.form.tagList = tags.map((t) => t.tagId)
+ },
+
+ users (users) {
+ this.form.emplList = users.map((u) => u.businessId)
+ }
+ },
+
+ created() {
+ this.newGroupId = this.$route.query.id
+ this.newGroupId && this.getDetail(this.newGroupId)
+ this.$route.meta.title = (this.newGroupId ? '编辑' : '新建') + '新客自动拉群'
+ }
+}
+
-
+
diff --git a/linkwe-ui/src/views/communityOperating/newCustomer/list.vue b/linkwe-ui/src/views/communityOperating/newCustomer/list.vue
index 29413defef8f397c1ddcf62699edba3c0afbfed1..2e1ae96da89c36c67ddff52f1857f1fa45642a02 100644
--- a/linkwe-ui/src/views/communityOperating/newCustomer/list.vue
+++ b/linkwe-ui/src/views/communityOperating/newCustomer/list.vue
@@ -1,5 +1,10 @@
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
- 新客自动拉群
- 客户通过员工活码添加员工，自动发送入群引导语、群活码，客户扫码入群。
+ 新建自动拉群
+
+
+
+
- 新建自动拉群批量下载
+ 批量删除
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- {{
- Math.floor(Math.random() * 10000)
- }}
-
-
- 已结束
+ >
+
+ {{ item.businessName }}
+
+ :show-overflow-tooltip="true"
+ >
+
+ {{ item.tagName }}
+
+
+ :show-overflow-tooltip="true"
+ >
+
+ {{ item.groupName }}
+
+
+
-
+
+ 编辑
查看下载
编辑删除
@@ -188,74 +356,17 @@ export default {
:limit.sync="query.pageSize"
@pagination="getList()"
/>
-
-
-
-
-
-
-
-
- 如何获取？
-
-
-
-
- 如何获取？
-
-
-
- 如何获取？
-
-
-
-
-
-
-
-
-
-
-
- 取 消
- 确 定
-
-
+
+
diff --git a/linkwe-ui/src/views/communityOperating/oldCustomer/aev.vue b/linkwe-ui/src/views/communityOperating/oldCustomer/aev.vue
index d9fdbce1d6f582bdc44706cec215412ab801499b..f5145593ef59023b7e406fadbd1a1a3dd4add51f 100644
--- a/linkwe-ui/src/views/communityOperating/oldCustomer/aev.vue
+++ b/linkwe-ui/src/views/communityOperating/oldCustomer/aev.vue
@@ -1,22 +1,369 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ groupQrCode && groupQrCode.codeUrl ? '修改' : '选择' }}
+
+
+
+
+ {{ sendType.label }}
+
+
+ 注：客户每天只能接收来自一名成员的一条群发消息，每月最多接收来自同一企业的四条群发消息。
+
+
+
+
+
+
+ {{ target.label }}
+
+
+
+
+
+ {{ sendGender.label }}
+
+
+
+
+
+
+
+
+ {{ tag.name }}
+ 添加标签
+
+
+
+ {{ user.name }}
+ {{ users.length ? '修改' : '添加' }}
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
![]()
-
+ methods: {
+ /** 获取详情 */
+ getDetail(id) {
+ this.loading = true
+ getDetail(id).then(({ data }) => {
+ this.form.taskName = data.taskName || ''
+ this.form.welcomeMsg = data.welcomeMsg || ''
+ this.form.sendType = data.sendType || 0
+ this.form.sendScope = data.sendScope || 0
+ this.form.sendGender = data.sendGender || 0
+
+ this.tags = data.tagList || []
+ this.users = data.scopeList || []
+ this.dateRange = [data.cusBeginTime || '', data.cusEndTime || '']
+
+ if (data.groupCodeInfo && data.groupCodeInfo.id) {
+ this.codes = [ data.groupCodeInfo ]
+ this.groupQrCode = data.groupCodeInfo
+ this.form.groupCodeId = this.groupQrCode.id
+ } else {
+ this.codes = []
+ this.groupQrCode = {}
+ this.form.groupCodeId = ''
+ }
+
+ this.loading = false
+ })
+ },
+
+ // 选择人员事件
+ submitSelectUser(users) {
+ this.users = users
+ },
+
+ // 选择tag事件
+ submitSelectTag(tags) {
+ this.tags = tags
+ },
+
+ // 选择二维码确认按钮
+ submitSelectQrCode(data) {
+ this.groupQrCode = data
+ this.form.groupCodeId = data.id
+ },
+
+ submit() {
+ if (this.form.sendScope === 1 && !this.form.scopeList.length) {
+ this.msgError('请至少选择一名使用员工')
+ return
+ }
+
+ if (this.form.sendScope === 1 && !this.form.tagList.length) {
+ this.msgError('请至少选择一个标签')
+ return
+ }
+
+ if (!this.form.groupCodeId) {
+ this.msgError('请选择一个群活码')
+ return
+ }
+
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ this.loading = true
+ if (this.taskId) {
+ update(this.taskId, this.form).then(() => {
+ this.msgSuccess('更新成功')
+ this.loading = false
+ this.$router.back()
+ }).catch(() => {
+ this.loading = false
+ })
+ } else {
+ add(this.form).then(() => {
+ this.msgSuccess('添加成功')
+ this.loading = false
+ this.$router.back()
+ }).catch(() => {
+ this.loading = false
+ })
+ }
+ }
+ })
+ },
+ },
+
+ watch: {
+ // 日期选择器数据同步至查询参数
+ dateRange (dateRange) {
+ if (!dateRange || dateRange.length !== 2) {
+ this.form.cusBeginTime = ''
+ this.form.cusEndTime = ''
+ } else {
+ [ this.form.cusBeginTime, this.form.cusEndTime ] = dateRange
+ }
+ },
+
+ users (users) {
+ this.form.scopeList = users.map((user) => {
+ return user.userId
+ })
+ },
+
+ tags (tags) {
+ this.form.tagList = tags.map((tag) => {
+ return tag.tagId
+ })
+ }
+ },
+
+ created() {
+ this.taskId = this.$route.query.id
+ this.taskId && this.getDetail(this.taskId)
+ }
+}
+
-
+
diff --git a/linkwe-ui/src/views/communityOperating/oldCustomer/list.vue b/linkwe-ui/src/views/communityOperating/oldCustomer/list.vue
index 10c2662fe5c506ee9a9bc1271272cbf55744cc49..aa7961c795aeb4366e5f66686ff816bc92c1b40b 100644
--- a/linkwe-ui/src/views/communityOperating/oldCustomer/list.vue
+++ b/linkwe-ui/src/views/communityOperating/oldCustomer/list.vue
@@ -1,150 +1,122 @@
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
查询
重置
-
-
新建标签建群
+
+
+
+
+ 新建任务
+
+
+
+
+
+ 批量删除
+
+
-
-
-
+
+
+
-
- {{
- Math.floor(Math.random() * 10000)
- }}
+
+
+
+ {{ parseInt(row.sendType) === 0 ? '企业群发' : '个人群发' }}
+
-
- 已结束
+
+
+
+
+ {{ row.totalMember }}
+
+
+
+
+
+ {{ getDisplayTags(row) }}
+
+
+
+
+
+
+
+
+
查看删除
编辑
@@ -180,73 +152,322 @@ export default {
@pagination="getList()"
/>
-
-
-
-
-
-
-
- 如何获取？
-
-
-
-
- 如何获取？
-
-
-
- 如何获取？
-
-
-
-
-
-
-
-
-
-
-
-
取 消
-
确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+ 已送达
+
+
+ 未送达
+
+
+
+
+
+
+
+ 在群
+
+
+ 不在群
+
+
+
+
+
+
-
- -
-
{{item.from}} {{parseTime(item.msgtime)}}
-
- {{item.text.content}}
-
-
-
-
-
- {{item.file.filename}}
-
-
-
-
-
-
-
-
-
-
-
-
-
{{item.card.corpname}}
-
-
-
-
- 播放
-
-
+
+
+
+ -
+
+
{{item.fromInfo.name}} {{parseTime(item.msgTime)}}
+
+ {{item.text.content}}
+
+
+
![]()
+
+ {{item.file.fileName}}
+
+
+
+
+
+
![]()
+
+
+
+
+
+
{{item.weApp.title}}
+
+
+
{{item.card.corpName}}
+
+
+
+
+
+
+
+ ![]()
+
+
+
\ No newline at end of file
+
+ }
+
+
diff --git a/linkwe-ui/src/views/conversation/component/curList.vue b/linkwe-ui/src/views/conversation/component/curList.vue
index 91b1d7aa23b12313f7917ac9972c243cbfe6d3cb..1e24346f43597ee441d095a7bc74344492e2c166 100644
--- a/linkwe-ui/src/views/conversation/component/curList.vue
+++ b/linkwe-ui/src/views/conversation/component/curList.vue
@@ -4,11 +4,11 @@
-
-
![]()
-
+ ![]()
+
{{item.roomInfo.groupName}} {{parseTime(item.finalChatContext.msgtime)}}
- {{item.finalChatContext.text.content}}
-
+ {{item.finalChatContext.text.content}}
+
@@ -45,6 +45,7 @@
\ No newline at end of file
diff --git a/linkwe-ui/src/views/conversation/component/list.vue b/linkwe-ui/src/views/conversation/component/list.vue
index 949714544fbaeb7f5053b3ac263987fde8476849..2d5e0e8e0082c6c333e0a913ca6d5522c7973197 100644
--- a/linkwe-ui/src/views/conversation/component/list.vue
+++ b/linkwe-ui/src/views/conversation/component/list.vue
@@ -4,11 +4,10 @@
-
-
![]()
-
- {{item.receiveWeCustomer.name}} {{parseTime(item.finalChatContext.msgtime)}}
- {{item.finalChatContext.text.content}}
-
+ ![]()
+
+ {{item.receiveWeCustomer.name}}
+
@@ -37,6 +36,7 @@
},
methods:{
liClick(e){
+ console.log(e,'liClick')
this.$emit('chatFn',e)
}
}
@@ -45,6 +45,7 @@
\ No newline at end of file
+.demo-form-inline {
+ background: #efefef;
+ padding: 18px 10px 0 10px;
+}
+/deep/ .add-btn {
+ margin-right: 10px;
+}
+.content {
+ margin-top: 15px;
+ padding: 10px;
+}
+.prompt-title {
+ margin-left: 10px;
+ color: #999;
+}
+.tag-place {
+ color: #1890ff;
+}
+.sub-title {
+ font-size: 13px;
+ color: #999;
+}
+
diff --git a/linkwe-ui/src/views/customerManage/customer.vue b/linkwe-ui/src/views/customerManage/customer.vue
index 6007b83849edfa8dc5663fa4148db35789c3ad1c..2daa828a310166505b2ecca44309629933a5b150 100644
--- a/linkwe-ui/src/views/customerManage/customer.vue
+++ b/linkwe-ui/src/views/customerManage/customer.vue
@@ -1,13 +1,13 @@
@@ -280,6 +313,7 @@ export default {
打标签
移除标签
{{ { 1: "@微信", 2: "@企业微信" }[scope.row.type] }}{{ { 1: '@微信', 2: '@企业微信' }[scope.row.type] }}
@@ -398,13 +435,16 @@ export default {
>
{{
-
- scope.row.weFlowerCustomerRels[0]?scope.row.weFlowerCustomerRels[0].userName:""
+ scope.row.weFlowerCustomerRels[0]
+ ? scope.row.weFlowerCustomerRels[0].userName
+ : ''
}}
{{
- scope.row.weFlowerCustomerRels[0]?scope.row.weFlowerCustomerRels[0].createTime:""
+ scope.row.weFlowerCustomerRels[0]
+ ? scope.row.weFlowerCustomerRels[0].createTime
+ : ''
}}
@@ -429,7 +469,7 @@ export default {
@click="
$router.push({
path: '/customerManage/customerDetail',
- query: { id: scope.row.externalUserid }
+ query: { id: scope.row.externalUserid },
})
"
type="text"
@@ -464,64 +504,6 @@ export default {
>
diff --git a/linkwe-ui/src/views/customerManage/customerDetail.vue b/linkwe-ui/src/views/customerManage/customerDetail.vue
index cd4eb84c58bd154f618a9631c7ee988c56c74a06..356f74f21a920aeb117459cbfd23b6ae2aad3737 100644
--- a/linkwe-ui/src/views/customerManage/customerDetail.vue
+++ b/linkwe-ui/src/views/customerManage/customerDetail.vue
@@ -10,6 +10,11 @@ export default {
weFlowerCustomerRels: [{}],
},
birthday: '',
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() > Date.now()
+ },
+ },
}
},
created() {
@@ -36,6 +41,13 @@ export default {
this.birthday = this.customer.birthday
})
},
+ remark(item) {
+ return (
+ item.remark ||
+ this.customer.name +
+ (item.remarkCorpName ? '-' + item.remarkCorpName : '')
+ )
+ },
},
}
@@ -66,6 +78,7 @@ export default {
v-if="datePickerVisible"
v-model="birthday"
type="date"
+ :picker-options="pickerOptions"
value-format="yyyy-MM-dd"
placeholder="选择日期便于以后客情维护"
@blur="datePickerVisible = false"
@@ -82,69 +95,63 @@ export default {
+