diff --git a/crm/src/main/resources/template/js/customermanage/customerlist.js b/crm/src/main/resources/template/js/customermanage/customerlist.js
index 7510cf6971e8cb7e1e809565eda9f3b066e3254d..9dba0a3de8c497849503017786218d50660b8d94 100644
--- a/crm/src/main/resources/template/js/customermanage/customerlist.js
+++ b/crm/src/main/resources/template/js/customermanage/customerlist.js
@@ -42,9 +42,9 @@ layui.config({
{ field: 'fromName', title: '客户来源', align: 'left', width: 120 },
{ field: 'industryName', title: '所属行业', align: 'left', width: 180 },
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 },
- { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 100 },
- { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 100 },
- { field: 'lastUpdateTime', title: '最后修改时间', align: 'center', width: 100},
+ { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
+ { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
+ { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150},
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
]],
done: function(json) {
diff --git a/crm/src/main/resources/template/js/customermanage/myConscientiousList.js b/crm/src/main/resources/template/js/customermanage/myConscientiousList.js
deleted file mode 100644
index 9f7913cc53d462f877abeb39ee11aecb45e4edd0..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/js/customermanage/myConscientiousList.js
+++ /dev/null
@@ -1,102 +0,0 @@
-var rowId = "";
-var searchType = "";
-
-layui.config({
- base: basePath,
- version: skyeyeVersion
-}).extend({
- window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
- winui.renderColor();
- var $ = layui.$,
- form = layui.form,
- table = layui.table;
-
- // 客户分类
- sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["crmCustomerType"]["key"], 'select', "typeId", '', form);
-
- // 客户来源
- sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["crmCustomerFrom"]["key"], 'select', "fromId", '', form);
-
- // 客户所属行业
- sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["crmCustomerIndustry"]["key"], 'select', "industryId", '', form);
-
- // 获取我负责的客户管理列表
- table.render({
- id: 'messageTable',
- elem: '#messageTable',
- method: 'post',
- url: flowableBasePath + 'customer010',
- where: getTableParams(),
- even: true,
- page: true,
- limits: getLimits(),
- limit: getLimit(),
- cols: [[
- { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
- { field: 'name', title: '客户名称', align: 'left', width: 300, templet: function (d) {
- return '' + d.name + '';
- }},
- { field: 'typeName', title: '客户分类', align: 'left', width: 120 },
- { field: 'fromName', title: '客户来源', align: 'left', width: 120 },
- { field: 'industryName', title: '所属行业', align: 'left', width: 180 },
- { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 },
- { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 100 },
- { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 100 },
- { field: 'lastUpdateTime', title: '最后修改时间', align: 'center', width: 100},
- { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
- ]],
- done: function(){
- matchingLanguage();
- }
- });
-
- table.on('tool(messageTable)', function (obj) {
- var data = obj.data;
- var layEvent = obj.event;
- if (layEvent === 'details'){ //详情
- details(data);
- }
- });
-
- form.render();
-
- // 详情
- function details(data){
- rowId = data.id;
- _openNewWindows({
- url: "../../tpl/customermanage/customerdetails.html",
- title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
- pageId: "customerdetails",
- area: ['90vw', '90vh'],
- callBack: function(refreshCode){
- }});
- }
-
- $("body").on("click", "#formSearch", function() {
- refreshTable();
- });
-
- $("body").on("click", "#reloadTable", function() {
- loadTable();
- });
-
- function loadTable(){
- table.reload("messageTable", {where: getTableParams()});
- }
-
- function refreshTable(){
- table.reload("messageTable", {page: {curr: 1}, where: getTableParams()});
- }
-
- function getTableParams(){
- return {
- name: $("#customerName").val(),
- typeId: $("#typeId").val(),
- fromId: $("#fromId").val(),
- industryId: $("#industryId").val()
- };
- }
-
- exports('myConscientiousList', {});
-});
\ No newline at end of file
diff --git a/crm/src/main/resources/template/js/customermanage/myCreateList.js b/crm/src/main/resources/template/js/customermanage/myCreateList.js
deleted file mode 100644
index e037988daeaba53e92e080a448f2619781e89c74..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/js/customermanage/myCreateList.js
+++ /dev/null
@@ -1,146 +0,0 @@
-var rowId = "";
-var searchType = "";
-
-layui.config({
- base: basePath,
- version: skyeyeVersion
-}).extend({
- window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
- winui.renderColor();
- var $ = layui.$,
- form = layui.form,
- table = layui.table;
-
- authBtn('1586179447152');
-
- // 客户分类
- sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["crmCustomerType"]["key"], 'select', "typeId", '', form);
-
- // 客户来源
- sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["crmCustomerFrom"]["key"], 'select', "fromId", '', form);
-
- // 客户所属行业
- sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["crmCustomerIndustry"]["key"], 'select', "industryId", '', form);
-
- // 获取我创建的客户管理列表
- table.render({
- id: 'messageTable',
- elem: '#messageTable',
- method: 'post',
- url: flowableBasePath + 'customer011',
- where: getTableParams(),
- even: true,
- page: true,
- limits: getLimits(),
- limit: getLimit(),
- cols: [[
- { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
- { field: 'name', title: '客户名称', align: 'left', width: 300, templet: function (d) {
- return '' + d.name + '';
- }},
- { field: 'typeName', title: '客户分类', align: 'left', width: 120 },
- { field: 'fromName', title: '客户来源', align: 'left', width: 120 },
- { field: 'industryName', title: '所属行业', align: 'left', width: 180 },
- { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 },
- { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 100 },
- { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 100 },
- { field: 'lastUpdateTime', title: '最后修改时间', align: 'center', width: 100},
- { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
- ]],
- done: function(){
- matchingLanguage();
- }
- });
-
- table.on('tool(messageTable)', function (obj) {
- var data = obj.data;
- var layEvent = obj.event;
- if (layEvent === 'edit') { // 编辑
- edit(data);
- }else if (layEvent === 'delete'){ // 删除
- del(data);
- }else if (layEvent === 'details'){ // 详情
- details(data);
- }
- });
-
- form.render();
-
- // 新增
- $("body").on("click", "#addBean", function() {
- _openNewWindows({
- url: "../../tpl/customermanage/customeradd.html",
- title: "新增客户",
- pageId: "customeradd",
- area: ['90vw', '90vh'],
- callBack: function(refreshCode){
- winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
- loadTable();
- }});
- });
-
- // 编辑
- function edit(data){
- rowId = data.id;
- _openNewWindows({
- url: "../../tpl/customermanage/customeredit.html",
- title: "编辑客户",
- pageId: "customeredit",
- area: ['90vw', '90vh'],
- callBack: function(refreshCode){
- winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
- loadTable();
- }});
- }
-
- // 详情
- function details(data){
- rowId = data.id;
- _openNewWindows({
- url: "../../tpl/customermanage/customerdetails.html",
- title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
- pageId: "customerdetails",
- area: ['90vw', '90vh'],
- callBack: function(refreshCode){
- }});
- }
-
- // 删除
- function del(data, obj){
- layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
- layer.close(index);
- AjaxPostUtil.request({url: flowableBasePath + "customer006", params: {rowId: data.id}, type: 'json', callback: function (json) {
- winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
- loadTable();
- }});
- });
- }
-
- $("body").on("click", "#formSearch", function() {
- refreshTable();
- });
-
- $("body").on("click", "#reloadTable", function() {
- loadTable();
- });
-
- function loadTable(){
- table.reload("messageTable", {where: getTableParams()});
- }
-
- function refreshTable(){
- table.reload("messageTable", {page: {curr: 1}, where: getTableParams()});
- }
-
- function getTableParams(){
- return {
- name: $("#customerName").val(),
- typeId: $("#typeId").val(),
- fromId: $("#fromId").val(),
- industryId: $("#industryId").val()
- };
- }
-
- exports('myCreateList', {});
-});
\ No newline at end of file
diff --git a/crm/src/main/resources/template/tpl/customermanage/myConscientiousList.html b/crm/src/main/resources/template/tpl/customermanage/myConscientiousList.html
deleted file mode 100644
index 090b8587cbc15638032eaf785c104be3d61ef5b6..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/tpl/customermanage/myConscientiousList.html
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/crm/src/main/resources/template/tpl/customermanage/myCreateList.html b/crm/src/main/resources/template/tpl/customermanage/myCreateList.html
deleted file mode 100644
index dd4fc84dab6eac126405d95c8b9bb3e10cecaf8f..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/tpl/customermanage/myCreateList.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableSearchUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableSearchUtil.js
index d55e7a9657576932abab3487860226f4a8e49526..c08f2c8aa325c30792ee6f82fcc47c95d176af29 100644
--- a/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableSearchUtil.js
+++ b/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableSearchUtil.js
@@ -207,6 +207,14 @@ var initTableSearchUtil = {
getVirtualSelectData: function (searchParam) {
var url = "";
eval('url = ' + searchParam.virtualDataFrom.service + ' + "' + searchParam.virtualDataFrom.url + '"');
+ var paramsStr = "";
+ if (!isNull(searchParam.virtualDataFrom.params)) {
+ $.each(searchParam.virtualDataFrom.params, function (key, value) {
+ paramsStr += key + '=' + eval(value) + '&';
+ });
+ }
+ // 加上参数
+ url += '?' + paramsStr;
var dataFrom = [];
AjaxPostUtil.request({url: url, params: {}, type: 'json', method: searchParam.virtualDataFrom.method, callback: function(json) {
dataFrom = [].concat(json.rows);