Merge pull request '智能表单添加table' (#30) from zzw into main
Reviewed-on: http://120.46.37.243:3000/scrm/alikeSCRM/pulls/30
This commit is contained in:
commit
eeabd39635
@ -3,17 +3,26 @@ package com.ruoyi.crm.system.controller;
|
|||||||
import com.ruoyi.common.annotation.Log;
|
import com.ruoyi.common.annotation.Log;
|
||||||
import com.ruoyi.common.core.controller.BaseController;
|
import com.ruoyi.common.core.controller.BaseController;
|
||||||
import com.ruoyi.common.core.domain.AjaxResult;
|
import com.ruoyi.common.core.domain.AjaxResult;
|
||||||
|
import com.ruoyi.common.core.domain.entity.SysDept;
|
||||||
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||||
import com.ruoyi.common.core.page.TableDataInfo;
|
import com.ruoyi.common.core.page.TableDataInfo;
|
||||||
import com.ruoyi.common.enums.BusinessType;
|
import com.ruoyi.common.enums.BusinessType;
|
||||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||||
|
import com.ruoyi.crm.system.domain.DesigneeWrapperClass;
|
||||||
import com.ruoyi.crm.system.domain.ServiceTicket;
|
import com.ruoyi.crm.system.domain.ServiceTicket;
|
||||||
import com.ruoyi.crm.system.service.IServiceTicketService;
|
import com.ruoyi.crm.system.service.IServiceTicketService;
|
||||||
|
import com.ruoyi.system.service.ISysDeptService;
|
||||||
|
import com.ruoyi.system.service.ISysUserService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
|
import org.springframework.util.StringUtils;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 服务工单Controller
|
* 服务工单Controller
|
||||||
@ -27,6 +36,10 @@ public class ServiceTicketController extends BaseController
|
|||||||
{
|
{
|
||||||
@Autowired
|
@Autowired
|
||||||
private IServiceTicketService serviceTicketService;
|
private IServiceTicketService serviceTicketService;
|
||||||
|
@Autowired
|
||||||
|
private ISysUserService userService;
|
||||||
|
@Autowired
|
||||||
|
private ISysDeptService deptService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询服务工单列表
|
* 查询服务工单列表
|
||||||
@ -95,4 +108,25 @@ public class ServiceTicketController extends BaseController
|
|||||||
{
|
{
|
||||||
return toAjax(serviceTicketService.deleteServiceTicketByIds(ids));
|
return toAjax(serviceTicketService.deleteServiceTicketByIds(ids));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 指定员工树形数据
|
||||||
|
*/
|
||||||
|
@GetMapping("/designatedPerson")
|
||||||
|
public AjaxResult designatedPerson(SysUser user){
|
||||||
|
ArrayList<DesigneeWrapperClass> designeeWrapperClassArrayList = new ArrayList<>();
|
||||||
|
List<SysUser> sysUsers = userService.selectUserList(user);
|
||||||
|
for (SysUser sysUser : sysUsers) {
|
||||||
|
DesigneeWrapperClass designeeWrapperClass = new DesigneeWrapperClass();
|
||||||
|
if (sysUser.getDept() != null){
|
||||||
|
SysDept dept = sysUser.getDept();
|
||||||
|
designeeWrapperClass.setLabel(dept.getDeptName());
|
||||||
|
designeeWrapperClassArrayList.add(designeeWrapperClass);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
designeeWrapperClassArrayList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(HashSet::new), ArrayList::new));
|
||||||
|
System.out.println(designeeWrapperClassArrayList.toString());
|
||||||
|
return AjaxResult.success(designeeWrapperClassArrayList);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,18 @@
|
|||||||
|
package com.ruoyi.crm.system.domain;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 服务工单指定销售人员树形数据结构类
|
||||||
|
*/
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class DesigneeWrapperClass {
|
||||||
|
//系统员工所属部门
|
||||||
|
private String label;
|
||||||
|
//系统员工姓名(数组)
|
||||||
|
private ArrayList<DesigneeWrapperClass> children;
|
||||||
|
|
||||||
|
}
|
@ -92,5 +92,17 @@ public class DynamicDataController extends BaseController {
|
|||||||
mongoTemplate.save(dynamicForm);
|
mongoTemplate.save(dynamicForm);
|
||||||
return AjaxResult.success("保存成功");
|
return AjaxResult.success("保存成功");
|
||||||
}
|
}
|
||||||
|
//根据卡片id查询对应采集数据的列表
|
||||||
|
@GetMapping("/collectDataList")
|
||||||
|
public AjaxResult collectDataList(String id){
|
||||||
|
Query query = new Query();
|
||||||
|
query.addCriteria(Criteria.where("dynamicDataId").is(id));
|
||||||
|
List<DynamicForm> dynamicForms = mongoTemplate.find(query, DynamicForm.class);
|
||||||
|
ArrayList<Object> list = new ArrayList<>();
|
||||||
|
for (DynamicForm dynamicForm : dynamicForms) {
|
||||||
|
list.add(dynamicForm.getMap());
|
||||||
|
}
|
||||||
|
return AjaxResult.success(list);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -17,3 +17,12 @@ export function saveDynamicData(data) {
|
|||||||
data: data
|
data: data
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//查询对应表单的采集数据列表
|
||||||
|
export function collectDataList(query) {
|
||||||
|
return request({
|
||||||
|
url: '/intelligentForm/collectDataList',
|
||||||
|
method: 'get',
|
||||||
|
params: {id:query}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
@ -36,7 +36,7 @@ export function treeselect() {
|
|||||||
// 查询服务工单下拉树结构
|
// 查询服务工单下拉树结构
|
||||||
export function designatedPerson() {
|
export function designatedPerson() {
|
||||||
return request({
|
return request({
|
||||||
url: '/system/dept/designatedPerson',
|
url: '/system/ticket/designatedPerson',
|
||||||
method: 'get'
|
method: 'get'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container" style="display: flex;flex-wrap: wrap;justify-content: space-between">
|
<div class="app-container" style="display: flex;flex-wrap: wrap">
|
||||||
|
|
||||||
<!-- <el-col :span="8" v-for="(o, index) in 1" :key="o" :offset="index > 0 ? 2 : 0">-->
|
<!-- <el-col :span="8" v-for="(o, index) in 1" :key="o" :offset="index > 0 ? 2 : 0">-->
|
||||||
|
|
||||||
@ -33,11 +33,12 @@ border-color: #fdfdff;">{{o.title}}</span>
|
|||||||
<p style="font-size: 25px">{{o.pageView}}</p>
|
<p style="font-size: 25px">{{o.pageView}}</p>
|
||||||
</div>
|
</div>
|
||||||
<div style="width: 30%">
|
<div style="width: 30%">
|
||||||
<div style="font-size: 18px;
|
<el-link style="font-size: 18px;
|
||||||
color: #999595;
|
color: #999595;
|
||||||
background-color:#ffffff;
|
background-color:#ffffff;
|
||||||
border-color: #fdfdff;">采集数量</div>
|
border-color: #fdfdff;"
|
||||||
<p style="font-size: 25px">{{o.collectionQuantity}}</p>
|
@click="extendList(o.id)">采集数量</el-link>
|
||||||
|
<p style="font-size: 25px" @click="extendList(o.id)">{{o.collectionQuantity}}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div style="display: flex;justify-content: space-between">
|
<div style="display: flex;justify-content: space-between">
|
||||||
@ -87,18 +88,37 @@ border-color: #fdfdff;">{{o.title}}</span>
|
|||||||
<el-input v-model="extendLink" placeholder="请输入内容" :disabled="true"></el-input>
|
<el-input v-model="extendLink" placeholder="请输入内容" :disabled="true"></el-input>
|
||||||
<el-button @click="copyAddress">复制</el-button>
|
<el-button @click="copyAddress">复制</el-button>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
<!-- 采集数据列表 -->
|
||||||
|
<el-dialog :title="collectTitle" :visible.sync="collectOpen" append-to-body>
|
||||||
|
<el-table border v-loading="loading" :data="collectLink" @selection-change="handleSelectionChange">
|
||||||
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
|
<div >
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<!-- <el-table-column label="编号" align="center" prop="id" />-->
|
||||||
|
<!-- <el-table-column label="id" align="center" prop="dynamicDataId" />-->
|
||||||
|
<!-- <el-table-column v-for="item in collectLink" :label="item.map" align="center" :prop="item" />-->
|
||||||
|
<template v-for="item in Object.keys(collectLink[0])">
|
||||||
|
<el-table-column :label="item">
|
||||||
|
<template #default="scope">
|
||||||
|
<span>{{scope.row[item]}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</template>
|
||||||
|
</el-table>
|
||||||
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { selectDynamicData, saveDynamicData } from "@/api/crm/intelligent";
|
import { selectDynamicData, saveDynamicData, collectDataList } from "@/api/crm/intelligent";
|
||||||
import VueClipboard from 'vue-clipboard2';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "Business",
|
name: "Business",
|
||||||
dicts: ['stage_type', 'sales_stage'],
|
dicts: ['stage_type', 'sales_stage'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
id: '',
|
||||||
inputarr:[''],
|
inputarr:[''],
|
||||||
// 遮罩层
|
// 遮罩层
|
||||||
loading: true,
|
loading: true,
|
||||||
@ -112,18 +132,22 @@ border-color: #fdfdff;">{{o.title}}</span>
|
|||||||
showSearch: true,
|
showSearch: true,
|
||||||
// 总条数
|
// 总条数
|
||||||
total: 0,
|
total: 0,
|
||||||
// 商机表格数据
|
|
||||||
businessList: [],
|
|
||||||
// 弹出层标题
|
// 弹出层标题
|
||||||
title: "",
|
title: "",
|
||||||
//推广弹出框标题
|
//推广弹出框标题
|
||||||
extendTitle: "",
|
extendTitle: "",
|
||||||
|
//采集数据列表弹出标题
|
||||||
|
collectTitle: "",
|
||||||
// 是否显示弹出层
|
// 是否显示弹出层
|
||||||
open: false,
|
open: false,
|
||||||
// 是否显示推广弹出层
|
// 是否显示推广弹出层
|
||||||
extendOpen: false,
|
extendOpen: false,
|
||||||
|
//是否显示采集数据列表弹出层
|
||||||
|
collectOpen: false,
|
||||||
//推广链接数据
|
//推广链接数据
|
||||||
extendLink: '',
|
extendLink: '',
|
||||||
|
//采集数据列表数据
|
||||||
|
collectLink: [{}],
|
||||||
//下拉框客户列表
|
//下拉框客户列表
|
||||||
customerList: [],
|
customerList: [],
|
||||||
//卡片列表
|
//卡片列表
|
||||||
@ -150,7 +174,6 @@ border-color: #fdfdff;">{{o.title}}</span>
|
|||||||
selectDynamicData().then(response => {
|
selectDynamicData().then(response => {
|
||||||
this.cardList = response.data;
|
this.cardList = response.data;
|
||||||
// this.total = response.total;
|
// this.total = response.total;
|
||||||
console.log(this.cardList,'list')
|
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -183,7 +206,7 @@ border-color: #fdfdff;">{{o.title}}</span>
|
|||||||
},
|
},
|
||||||
//推广按钮操作
|
//推广按钮操作
|
||||||
handelExtend(id) {
|
handelExtend(id) {
|
||||||
this.extendLink = 'https://101.43.112.107:8080/form/extendLink/form?id='+id
|
this.extendLink = 'http://101.43.112.107/form/extendLink/form?id='+id
|
||||||
this.extendOpen = true;
|
this.extendOpen = true;
|
||||||
this.extendTitle = "推广链接";
|
this.extendTitle = "推广链接";
|
||||||
},
|
},
|
||||||
@ -195,7 +218,24 @@ border-color: #fdfdff;">{{o.title}}</span>
|
|||||||
input.select();
|
input.select();
|
||||||
document.execCommand('copy');
|
document.execCommand('copy');
|
||||||
document.body.removeChild(input);
|
document.body.removeChild(input);
|
||||||
alert('已复制到剪贴板'); },
|
alert('已复制到剪贴板');
|
||||||
|
},
|
||||||
|
//采集数据展示
|
||||||
|
extendList(id){
|
||||||
|
this.collectLink = null;
|
||||||
|
this.id = id
|
||||||
|
this.collectOpen = true;
|
||||||
|
this.collectTitle = "采集数据";
|
||||||
|
collectDataList(this.id).then(response => {
|
||||||
|
this.collectLink = response.data
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// 多选框选中数据
|
||||||
|
handleSelectionChange(selection) {
|
||||||
|
this.ids = selection.map(item => item.id)
|
||||||
|
this.single = selection.length!==1
|
||||||
|
this.multiple = !selection.length
|
||||||
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
@ -58,8 +58,8 @@ export default {
|
|||||||
// tenant: 'zy_tenant',
|
// tenant: 'zy_tenant',
|
||||||
// username: 'zy_admin',
|
// username: 'zy_admin',
|
||||||
// password: 'admin123',
|
// password: 'admin123',
|
||||||
tenant: 'tenant1',
|
tenant: 'zy_tenant',
|
||||||
username: 'admin',
|
username: 'zy_admin',
|
||||||
password: 'admin123',
|
password: 'admin123',
|
||||||
rememberMe: false,
|
rememberMe: false,
|
||||||
code: '',
|
code: '',
|
||||||
|
Loading…
Reference in New Issue
Block a user