修复日历事件共享bug

This commit is contained in:
乐风 2021-07-28 05:09:38 +08:00
parent 7ffb549bc6
commit 566954dfcf
18 changed files with 188 additions and 124 deletions

View File

@ -1,31 +1,45 @@
2021-05-02
1.修改表单模板子字段添加时因为换行符导致前端JSON解析报错
2.修改表单模板模板属性字段更新,优化显示方式,加入提示
3.修改去掉打印插件调用全部改成html打印方式后续还将继续优化打印功能
4.修改dialog前端逻辑封装更多的代码为通用代码
5.修改引入gdoo自定义事件出现的子表编辑时无法判断字段权限bug
本版本更新了个别sql需要重新导入
1.修改表单模板子字段添加时因为换行符导致前端JSON解析报错
2.修改表单模板模板属性字段更新,优化显示方式,加入提示
3.修改去掉打印插件调用全部改成html打印方式后续还将继续优化打印功能
4.修改dialog前端逻辑封装更多的代码为通用代码
5.修改引入gdoo自定义事件出现的子表编辑时无法判断字段权限bug
本版本更新了个别sql需要重新导入
2021-06-08 开源测试版 2.3.3发布
1.修改项目管理管理员查看所有项目,其他用户只能查看自己的项目和参与的项目
2.修复模型绑定数据无法解除
3.修复首页部件客户生日报sql错误
4.修复首页待办事项不显示
5.修复菜单badge不显示
6.删除废弃的工作流程模块
本版本更新了个别sql需要重新导入
1.修改项目管理管理员查看所有项目,其他用户只能查看自己的项目和参与的项目
2.修复模型绑定数据无法解除
3.修复首页部件客户生日报sql错误
4.修复首页待办事项不显示
5.修复菜单badge不显示
6.删除废弃的工作流程模块
本版本更新了个别sql需要重新导入
2021-06-18 开源测试版 2.3.4发布
修正
1.角色权限设置错乱
2.区域销售品类表无数据判断报错
新增
1.单据权限设置子表是否必填选项
修正
1.角色权限设置错乱
2.区域销售品类表无数据判断报错
新增
1.单据权限设置子表是否必填选项
本版本sql文件导入可选没有不兼容修改
本版本sql文件导入可选没有不兼容修改
2021-07-01 开源测试版 2.3.4 更新记录
修正
1.客户任务详情sql报错
修正
1.客户任务详情sql报错
SQL更新请执行: database/gdoo-2.3.4-2021-07-01.sql
SQL更新请执行: database/gdoo-2.3.4-2021-07-01.sql
2021-07-04 开源测试版 2.3.5 发布
修正
1.widget部件修改逻辑和权限修改全局显示方式
2.新增用户默认显示全局权限的部件和信息
3.保存和更新数据为空值时无法保存
4.仪表盘设置获取有权限的部件和信息
本版本sql文件导入可选没有不兼容修改
2021-07-28 开源测试版 2.3.5 更新记录
修正
1.日历共享事件重复bug
SQL更新: 导入database/share-2021-07-28.sql或者按新的结构修改。

View File

@ -21,17 +21,7 @@ class WidgetController extends DefaultController
->permission('receive_id')
->orderBy('created_at', 'desc');
// 查询是否已经阅读
$reader = function ($q) {
$q->selectRaw('1')
->from('article_reader')
->whereRaw('article_reader.article_id = article.id')
->where('article_reader.created_id', auth()->id());
};
$model->whereNotExists($reader);
$rows = $model->get(['id', 'name', 'created_at']);
$rows = $model->limit(15)->get(['id', 'name', 'created_at']);
$json['total'] = sizeof($rows);
$json['data'] = $rows;
return $json;
@ -73,6 +63,7 @@ class WidgetController extends DefaultController
'count2' => $count2,
'rate' => $rate,
];
return $this->render([
'dates' => $config['dates'],
'info' => $config['info'],

View File

@ -14,7 +14,7 @@ return [
'more_url' => 'article/article/index',
],
'info_article_index' => [
'name' => '新增公告',
'name' => '未读公告',
'type' => 2,
'url' => 'article/widget/info',
'more_url' => 'article/article/index',

View File

@ -9,7 +9,7 @@
</a>
</div>
<div class="info-r">
<div>{{$dates[$info['params']['date']]}}</div>
<div>{{$dates[$info['params']['date']]}}</div>
<div class="rate @if($res['rate'] > 100) red @endif">{{$res['rate']}}%</div>
</div>
</div>

View File

@ -58,16 +58,16 @@ class CalendarController extends DefaultController
$url = url('event/index', ['calendar_id'=>$calendar['id']]);
}
$sources[] = [
'url' => $url,
'id' => $calendar['id'],
'userid' => $calendar['userid'],
'url' => $url,
'id' => $calendar['id'],
'userid' => $calendar['userid'],
'backgroundColor' => $calendar['calendarcolor'],
"borderColor" => $calendar['calendarcolor'],
"borderColor" => $calendar['calendarcolor'],
];
}
return $this->json([
'calendars' => $calendars,
'sources' => $sources,
'sources' => $sources,
], true);
}

View File

@ -44,7 +44,7 @@ class EventController extends DefaultController
}
// 获取共享事件
$shared = ShareService::getItemsSourceBy(['event'], $gets['user_id']);
$shared = ShareService::getItemsSourceBy(['event'], $gets['user_id'], $gets['start'], $gets['end']);
$share_id = Arr::pluck($shared, 'source_id');
if (count($share_id)) {
$share = Arr::pluck($shared, 'name', 'source_id');

View File

@ -15,7 +15,7 @@ class Controller extends BaseController
/**
* @var 程序版本
*/
public $version = '2.3.4';
public $version = '2.3.5';
/**
* @var 配置参数

View File

@ -17,7 +17,6 @@ class DashboardController extends DefaultController
$widgets = DB::table('widget')
->where('type', 1)
->where('status', 1)
->where('default', 1)
->permission('receive_id')
->orderBy('sort', 'asc')
->get();
@ -30,7 +29,6 @@ class DashboardController extends DefaultController
$widgets->transform(function ($row) use($user_widgets) {
$user_widget = $user_widgets[$row['id']];
if (not_empty($user_widget)) {
$row['id'] = $user_widget['id'];
$row['status'] = $user_widget['status'];
$row['grid'] = $user_widget['grid'];
$row['sort'] = $user_widget['sort'];
@ -44,15 +42,16 @@ class DashboardController extends DefaultController
$row['icon'] = $user_widget['icon'];
}
$row['params'] = json_decode($user_widget['params'], true);
return $row;
} else {
$row['status'] = $row['default'] == 1;
}
return $row;
});
$widgets = $widgets->sortBy('sort');
$widgets = $widgets->sortBy('sort')->values();
$infos = DB::table('widget')
->where('type', 2)
->where('status', 1)
->where('default', 1)
->permission('receive_id')
->orderBy('sort', 'asc')
->get();
@ -65,7 +64,6 @@ class DashboardController extends DefaultController
$infos->transform(function ($row) use($user_infos) {
$user_info = $user_infos[$row['id']];
if (not_empty($user_info)) {
$row['id'] = $user_info['id'];
$row['status'] = $user_info['status'];
$row['sort'] = $user_info['sort'];
if ($user_info['name']) {
@ -78,10 +76,12 @@ class DashboardController extends DefaultController
$row['icon'] = $user_info['icon'];
}
$row['params'] = json_decode($user_info['params'], true);
return $row;
} else {
$row['status'] = $row['default'] == 1;
}
return $row;
});
$infos = $infos->sortBy('sort');
$infos = $infos->sortBy('sort')->values();
$quicks = Menu::leftJoin('user_widget', 'user_widget.node_id', '=', 'menu.id')
->where('user_widget.user_id', $auth['id'])
@ -159,15 +159,14 @@ class DashboardController extends DefaultController
$widgets = DB::table('widget')
->where('type', 1)
->where('status', 1)
->where('default', 1)
->permission('receive_id')
->orderBy('sort', 'asc')
->get(['id', 'name', 'color', 'icon', 'grid', 'status']);
->get();
$user_widgets = UserWidget::where('user_id', $auth['id'])
->where('type', 1)
->orderBy('sort', 'asc')
->get(['id', 'name', 'color', 'icon', 'grid', 'node_id', 'status'])->keyBy('node_id');
->get()->keyBy('node_id');
$widgets->transform(function ($row) use($user_widgets) {
$user_widget = $user_widgets[$row['id']];
@ -189,20 +188,19 @@ class DashboardController extends DefaultController
}
return $row;
});
$widgets = $widgets->sortBy('sort');
$widgets = $widgets->sortBy('sort')->values();
$infos = DB::table('widget')
->where('type', 2)
->where('status', 1)
->where('default', 1)
->permission('receive_id')
->orderBy('sort', 'asc')
->get(['id', 'name', 'color', 'icon', 'grid', 'status']);
->get();
$user_infos = UserWidget::where('user_id', $auth['id'])
->where('type', 2)
->orderBy('sort', 'asc')
->get(['id', 'name', 'color', 'icon', 'grid', 'node_id', 'status', 'params'])->keyBy('node_id');
->get()->keyBy('node_id');
$infos->transform(function ($row) use($user_infos) {
$user_info = $user_infos[$row['id']];
@ -224,7 +222,7 @@ class DashboardController extends DefaultController
}
return $row;
});
$infos = $infos->sortBy('sort');
$infos = $infos->sortBy('sort')->values();
$menus = UserWidget::where('user_id', $auth['id'])
->where('type', 3)
@ -281,13 +279,16 @@ class DashboardController extends DefaultController
$info_id = Request::input('info_id');
$row = UserWidget::where('id', $info_id)->first();
$widget = Widget::where('id', $row['node_id'])->first();
$params = json_decode($row['params'], true);
if (empty($row['date'])) {
$row['date'] = 'month';
if (empty($params['date'])) {
$params['date'] = 'month';
}
if (empty($row['permission'])) {
$row['permission'] = 'dept';
if (empty($params['permission'])) {
$params['permission'] = 'dept';
}
$row['params'] = $params;
$row['widget_name'] = $widget['name'];
return $this->render([
@ -303,12 +304,16 @@ class DashboardController extends DefaultController
$widget_id = Request::input('widget_id');
$row = UserWidget::where('id', $widget_id)->first();
$widget = Widget::where('id', $row['node_id'])->first();
if (empty($row['date'])) {
$row['date'] = 'month';
$params = json_decode($row['params'], true);
if (empty($params['date'])) {
$params['date'] = 'month';
}
if (empty($row['permission'])) {
$row['permission'] = 'dept';
if (empty($params['permission'])) {
$params['permission'] = 'dept';
}
$row['params'] = $params;
$row['widget_name'] = $widget['name'];
return $this->render([

View File

@ -36,12 +36,12 @@ class InfoService
'year2' => '前年',
];
$user_info = UserWidget::where('user_id', $auth['id'])
->where('id', $gets['id'])->first();
$info = Widget::where('id', $user_info['node_id'])
$info = Widget::where('id', $gets['id'])
->first();
$user_info = UserWidget::where('user_id', $auth['id'])
->where('node_id', $gets['id'])->first();
if (not_empty($user_info)) {
$info['id'] = $user_info['id'];
if ($user_info['name']) {
@ -59,6 +59,9 @@ class InfoService
$permission = empty($params['permission']) ? 'department' : $params['permission'];
$date = empty($params['date']) ? 'month' : $params['date'];
$params['permission'] = $permission;
$params['date'] = $date;
$info['params'] = $params;
switch ($date) {
case 'day':
@ -104,8 +107,8 @@ class InfoService
$sql = $sql2 = '';
switch ($date) {
case 'day':
$sql = sql_year_month_day($table.'created_at','ts')."='$day'";
$sql2 = sql_year_month_day($table.'created_at','ts')."='$day2'";
$sql = sql_year_month_day($table.'.created_at','ts')."='$day'";
$sql2 = sql_year_month_day($table.'.created_at','ts')."='$day2'";
break;
case 'day2':
$sql = sql_year_month_day($table.'.created_at','ts')."='$day2'";

View File

@ -8,13 +8,24 @@ class ShareService
/**
* 获取分享数据
*/
public static function getItemsSourceBy(array $source_type, $user_id)
public static function getItemsSourceBy(array $source_type, $user_id, $start_at = null, $end_at = null)
{
$user = User::find($user_id);
return Share::leftJoin('user', 'share.created_id', '=', 'user.id')
$model = Share::leftJoin('user', 'share.created_id', '=', 'user.id')
->permission('share.receive_id', $user)
->whereIn('share.source_type', $source_type)
->get(['share.*', 'user.name', 'user.username']);
->whereIn('share.source_type', $source_type);
$start_at = strtotime($start_at);
$end_at = strtotime($end_at) + 86400;
if ($start_at > 0 && $end_at > 0) {
$model->whereRaw('
(share.start_at between '.$start_at.' and '.$end_at.' or share.end_at between '.$start_at.' and '.$end_at.')
or (share.is_repeat = 1 and share.start_at <= '.$end_at.')
');
}
return $model->get(['share.*', 'user.name', 'user.username']);
}
/**

View File

@ -286,7 +286,7 @@ var settingWidget = Vue.createApp({
var me = this;
formDialog({
title: '配置',
url: app.url('index/dashboard/settingInfo', {info_id:item.info_id}),
url: app.url('index/dashboard/settingInfo', {id:item.id}),
id: 'setting-info',
dialogClass:'modal-sm',
onSubmit: function() {
@ -303,7 +303,7 @@ var settingWidget = Vue.createApp({
var me = this;
formDialog({
title: '配置',
url: app.url('index/dashboard/settingWidget', {widget_id:item.widget_id}),
url: app.url('index/dashboard/settingWidget', {id:item.id}),
id: 'setting-widget',
dialogClass:'modal-sm',
onSubmit: function() {

View File

@ -17,7 +17,7 @@
<td>
<select class="form-control input-sm" name="permission" id="permission">
@foreach($permissions as $key => $permission)
<option value="{{$key}}" @if($row['permission'] == $key) selected="selected" @endif>{{$permission}}</option>
<option value="{{$key}}" @if($row['params']['permission'] == $key) selected="selected" @endif>{{$permission}}</option>
@endforeach
</select>
</td>
@ -27,7 +27,7 @@
<td>
<select class="form-control input-sm" name="date" id="date">
@foreach($dates as $key => $date)
<option value="{{$key}}" @if($row['date'] == $key) selected="selected" @endif>{{$date}}</option>
<option value="{{$key}}" @if($row['params']['date'] == $key) selected="selected" @endif>{{$date}}</option>
@endforeach
</select>
</td>

View File

@ -2,6 +2,9 @@
#order-index-widget .ag-header-cell-label {
justify-content: left !important;
}
#order-index-widget .ag-header {
border-bottom: 0;
}
</style>
<div class="wrapper-sm p-t-none">
<div class="gdoo-list-grid">
@ -14,6 +17,7 @@
var options = new agGridOptions();
options.remoteDataUrl = '{{url()}}';
options.remoteParams = {};
options.headerHeight = 0;
var columnDefs = [{
field: 'title',
cellClass:'text-left',

View File

@ -9,7 +9,7 @@
</a>
</div>
<div class="info-r">
<div>{{$dates[$info['params']['date']]}}</div>
<div>{{$dates[$info['params']['date']]}}</div>
<div class="rate @if($res['rate'] > 100) red @endif">{{$res['rate']}}%</div>
</div>
</div>

View File

@ -114,7 +114,7 @@ class Builder extends BaseBuilder
if ($column['is_identity'] == 1) {
continue;
}
if (isset($values[$k])) {
if (array_key_exists($k, $values)) {
$v = $values[$k];
// 数字类型格式化
if (isset($numbers[$column['data_type']])) {

View File

@ -1 +0,0 @@
ALTER TABLE `customer_task_data` ADD INDEX `idx_code`(`code`);

View File

@ -11,7 +11,7 @@
Target Server Version : 100508
File Encoding : 65001
Date: 18/06/2021 17:27:53
Date: 28/07/2021 04:54:05
*/
SET NAMES utf8mb4;
@ -351,7 +351,7 @@ CREATE TABLE `article_reader` (
PRIMARY KEY (`id`) USING BTREE,
INDEX `idx_article_reader_article_id`(`article_id`) USING BTREE,
INDEX `idx_article_reader_created_id`(`created_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of article_reader
@ -359,6 +359,7 @@ CREATE TABLE `article_reader` (
INSERT INTO `article_reader` VALUES (10, 23, '系统管理员', 1602514708, 1);
INSERT INTO `article_reader` VALUES (11, 24, '系统管理员', 1605481210, 1);
INSERT INTO `article_reader` VALUES (12, 22, '系统管理员', 1614291097, 1);
INSERT INTO `article_reader` VALUES (13, 24, '赵云', 1625349843, 3);
-- ----------------------------
-- Table structure for attachment
@ -1851,12 +1852,13 @@ CREATE TABLE `customer_task` (
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注',
PRIMARY KEY (`id`) USING BTREE,
INDEX `idx_customer_task_sn`(`sn`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '客户联系人' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '客户联系人' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of customer_task
-- ----------------------------
INSERT INTO `customer_task` VALUES (1, 2020, 0, '2020-10-12', 1602516750, '系统管理员', '系统管理员', 1615845758, 1, 1, '202010120001', NULL);
INSERT INTO `customer_task` VALUES (2, 2022, NULL, '2021-06-28', 1624882518, '系统管理员', NULL, NULL, 1, NULL, '202106280001', '212');
-- ----------------------------
-- Table structure for customer_task_data
@ -1887,13 +1889,15 @@ CREATE TABLE `customer_task_data` (
`total` decimal(10, 2) NULL DEFAULT NULL COMMENT '合计(万)',
`code` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '编号',
PRIMARY KEY (`id`) USING BTREE,
INDEX `idx_customer_task_data_customer_id`(`customer_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '客户联系人' ROW_FORMAT = Dynamic;
INDEX `idx_customer_task_data_customer_id`(`customer_id`) USING BTREE,
INDEX `idx_code`(`code`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '客户联系人' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of customer_task_data
-- ----------------------------
INSERT INTO `customer_task_data` VALUES (1, 1, 1, 1602516750, '系统管理员', '系统管理员', 1615845758, 1, 1, 1.00, 2.00, 3.00, 2.00, 3.00, 3.00, 32.00, 3.00, 3.00, 3.00, 213.00, 3.00, 271.00, '123');
INSERT INTO `customer_task_data` VALUES (2, 2, 2, 1624882518, '系统管理员', NULL, NULL, 1, NULL, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 120.00, '12');
-- ----------------------------
-- Table structure for customer_tax
@ -5072,7 +5076,7 @@ CREATE TABLE `product_formula` (
PRIMARY KEY (`id`) USING BTREE,
INDEX `idx_product_formula_product_id`(`product_id`) USING BTREE,
INDEX `idx_product_formula_material_id`(`material_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1097 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 1098 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of product_formula
@ -5887,7 +5891,7 @@ INSERT INTO `product_formula` VALUES (1080, 20327, 16, 3.26, 1, NULL, 0.000, 100
INSERT INTO `product_formula` VALUES (1081, 20327, 18, 0.47, 1, NULL, 0.000, 10002, '甘小艳', 0);
INSERT INTO `product_formula` VALUES (1082, 20356, 19, 4.66, 1, NULL, NULL, 10002, '甘小艳', NULL);
INSERT INTO `product_formula` VALUES (1083, 20385, 12, 8.49, 1, NULL, NULL, 10002, '甘小艳', NULL);
INSERT INTO `product_formula` VALUES (1084, 20364, 54, 2.75, 1, '', 0.000, 10002, '甘小艳', 0);
INSERT INTO `product_formula` VALUES (1084, 20410, 54, 2.75, 1, '', 0.000, 10002, '甘小艳', 0);
INSERT INTO `product_formula` VALUES (1085, 20362, 54, 2.25, 1, '', 0.000, 10002, '甘小艳', 0);
INSERT INTO `product_formula` VALUES (1087, 20409, 3, 6.32, 1, NULL, 0.000, 2079, '甘小艳', 1586326241);
INSERT INTO `product_formula` VALUES (1088, 20410, 3, 6.32, 1, NULL, 0.000, 2079, '甘小艳', 1586326241);
@ -5899,6 +5903,7 @@ INSERT INTO `product_formula` VALUES (1093, 1456, 36, 0.04, 1, NULL, NULL, 2079,
INSERT INTO `product_formula` VALUES (1094, 1465, 36, 0.04, 1, NULL, NULL, 2079, '甘小艳', 1593501092);
INSERT INTO `product_formula` VALUES (1095, 1465, 18, 0.28, 1, NULL, NULL, 2079, '甘小艳', 1593501184);
INSERT INTO `product_formula` VALUES (1096, 1456, 18, 0.28, 1, NULL, NULL, 2079, '甘小艳', 1593501184);
INSERT INTO `product_formula` VALUES (1097, 20410, 54, NULL, NULL, NULL, NULL, 1, '系统管理员', 1624571443);
-- ----------------------------
-- Table structure for product_material
@ -6600,7 +6605,7 @@ INSERT INTO `purchase_order_data` VALUES (3, 2, NULL, NULL, NULL, NULL, 16141917
DROP TABLE IF EXISTS `region`;
CREATE TABLE `region` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`parent_id` int(11) NULL DEFAULT NULL COMMENT '上级',
`parent_id` int(11) NOT NULL DEFAULT 0 COMMENT '上级',
`name` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
`code` int(11) NULL DEFAULT NULL,
`layer` tinyint(4) NULL DEFAULT NULL,
@ -6614,7 +6619,7 @@ CREATE TABLE `region` (
INDEX `idx_region_code`(`code`) USING BTREE,
INDEX `idx_region_layer`(`layer`) USING BTREE,
INDEX `idx_region_parent_id`(`parent_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 3194 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 3196 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of region
@ -10063,6 +10068,7 @@ CREATE TABLE `share` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`source_id` int(11) NOT NULL,
`source_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
`is_repeat` tinyint(3) NOT NULL DEFAULT 0 COMMENT '重复标记',
`receive_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '共享编号',
`receive_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '共享名称',
`permissions` smallint(6) NULL DEFAULT NULL,
@ -10070,8 +10076,11 @@ CREATE TABLE `share` (
`end_at` int(11) NULL DEFAULT NULL COMMENT '结束时间',
`created_by` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
`created_id` int(11) NULL DEFAULT NULL,
`created_at` int(10) NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE,
INDEX `idx_share_source_id`(`source_id`) USING BTREE
INDEX `idx_source_id`(`source_id`) USING BTREE,
INDEX `idx_source_type`(`source_type`) USING BTREE,
INDEX `idx_is_repeat`(`is_repeat`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
-- ----------------------------
@ -11063,7 +11072,7 @@ CREATE TABLE `system_log` (
`type` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '日志类型',
PRIMARY KEY (`id`) USING BTREE,
INDEX `idx_action_log_created_id`(`created_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 37 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 38 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of system_log
@ -11135,10 +11144,10 @@ CREATE TABLE `user` (
-- ----------------------------
-- Records of user
-- ----------------------------
INSERT INTO `user` VALUES (1, 'admin', '系统管理员', 20, 1, 3, 0, 0, 1, 0, '', 0, NULL, '18vYWCCr4QiK2fTooowr5iWw9A70Ui6fQSTHs5ZAJzxbZuwSnbmH8f1Gr0Cn', 1, 1, '2020-10-05', 0, '', '', 3, '028-12345678', '', '', '24', '', 1, '$2y$10$DFN0jlZa0x3IGcZAkolJTuYMnJpOnX78L9XG2Q5N2Y32FuAST8UwO', '123456', 'fvzone@qq.com', 0, '0', 0, 'blue2', '系统管理员', 1623574074, 0, '', 0, NULL, '', '15182223008', 24);
INSERT INTO `user` VALUES (1, 'admin', '系统管理员', 20, 1, 3, 0, 0, 1, 0, '', 0, NULL, 'u8iVSaXR8r9ItU4asOXqjpjzDsGrZANdGVd4zVkPiOXgWTvQW4WuxND7WanI', 1, 1, '2020-10-05', 0, '', '', 3, '028-12345678', '', '', '24', '', 1, '$2y$10$DFN0jlZa0x3IGcZAkolJTuYMnJpOnX78L9XG2Q5N2Y32FuAST8UwO', '123456', 'fvzone@qq.com', 0, '0', 0, 'blue2', '系统管理员', 1625352318, 0, '', 0, NULL, '', '15182223008', 24);
INSERT INTO `user` VALUES (2, '01001', '王二小食品有限公司', 1, 2, NULL, NULL, NULL, 2, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, 1594147787, '系统管理员', NULL, NULL, '系统管理员', 1615757797, NULL, NULL, 1, NULL, NULL, '213', NULL);
INSERT INTO `user` VALUES (3, '赵云', '赵云', 3, 1, 0, NULL, NULL, 1, NULL, NULL, 0, NULL, 'jzzOIclqiE5180Lj27Ir8fEkP7THFHhHKDuzj8IlYWd8025ROeDJRCflDZAs', 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, '$2y$10$qkonB.DXNaXvAzNQinz9UeXLAmIybudyYCN4FWiTf6JyeQk4BXT8W', '123456', NULL, 1601234908, '系统管理员', NULL, 'blue2', '赵云', 1623574086, NULL, NULL, 0, NULL, NULL, '15182223008', 0);
INSERT INTO `user` VALUES (4, '关羽', '关羽', 19, 83, 0, NULL, NULL, 1, NULL, NULL, 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, '$2y$10$a/sqD3GeTkC5UkB4BDyOvu67uQIoGm1sRLVS5TFyQsePC0qm0cT8m', '123456', NULL, 1601369401, '系统管理员', NULL, NULL, '系统管理员', 1614397204, NULL, NULL, 1, NULL, NULL, '15182223008', 0);
INSERT INTO `user` VALUES (3, '赵云', '赵云', 3, 1, 0, NULL, NULL, 1, NULL, NULL, 0, NULL, 'wcKgC2FORgT0LKm5hC5vgCTvrrgZqhT2BcNUfvFW8xqAS82SBmRFzwgkuD2o', 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, '$2y$10$qkonB.DXNaXvAzNQinz9UeXLAmIybudyYCN4FWiTf6JyeQk4BXT8W', '123456', NULL, 1601234908, '系统管理员', NULL, 'blue2', '赵云', 1625352333, NULL, NULL, 0, NULL, NULL, '15182223008', 0);
INSERT INTO `user` VALUES (4, '关羽', '关羽', 19, 83, 0, NULL, NULL, 1, NULL, NULL, 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, '$2y$10$a/sqD3GeTkC5UkB4BDyOvu67uQIoGm1sRLVS5TFyQsePC0qm0cT8m', '123456', NULL, 1601369401, '系统管理员', NULL, 'lilac', '关羽', 1625351486, NULL, NULL, 0, NULL, NULL, '15182223008', 0);
INSERT INTO `user` VALUES (5, '52347', '刘洋', NULL, 95, NULL, NULL, NULL, 3, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, 1603204082, '系统管理员', NULL, NULL, '系统管理员', 1612575522, NULL, NULL, NULL, NULL, NULL, '15879653821', NULL);
INSERT INTO `user` VALUES (6, '100002', '四川幺麻子食品公司', 17, 2, NULL, NULL, NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, '$2y$10$Gb4n4ea3nlMGxJsPKSWBUug8hZFLj4xI831Gru.s78ZX314UwyEOm', '123456', NULL, 1620468708, '系统管理员', NULL, NULL, '系统管理员', 1620470105, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `user` VALUES (7, '100003', '百家食品有限公司', 17, 2, NULL, NULL, NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, '123456', '123456', NULL, 1620469893, '系统管理员', NULL, NULL, '系统管理员', 1620470124, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@ -11338,7 +11347,7 @@ CREATE TABLE `user_warehouse` (
PRIMARY KEY (`id`, `user_id`, `warehouse_id`) USING BTREE,
INDEX `idx_user_warehouse_user_id`(`user_id`) USING BTREE,
INDEX `idx_user_warehouse_id`(`warehouse_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of user_warehouse
@ -11355,6 +11364,7 @@ INSERT INTO `user_warehouse` VALUES (9, 1, 20048);
INSERT INTO `user_warehouse` VALUES (10, 1, 20051);
INSERT INTO `user_warehouse` VALUES (11, 1, 20053);
INSERT INTO `user_warehouse` VALUES (12, 1, 20054);
INSERT INTO `user_warehouse` VALUES (13, 1, 20056);
-- ----------------------------
-- Table structure for user_widget
@ -11378,32 +11388,11 @@ CREATE TABLE `user_widget` (
PRIMARY KEY (`id`) USING BTREE,
INDEX `idx_user_id`(`user_id`) USING BTREE,
INDEX `idx_node_id`(`node_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 36 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 57 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of user_widget
-- ----------------------------
INSERT INTO `user_widget` VALUES (1, 1, '待办事项', 1, 'default', NULL, NULL, 'fa-ambulance', '8', 1, NULL, 1, 34, NULL);
INSERT INTO `user_widget` VALUES (2, 1, '待办流程', 2, 'info', NULL, NULL, 'fa-pencil', '8', 1, NULL, 1, 2, NULL);
INSERT INTO `user_widget` VALUES (3, 1, '订单统计', 3, 'info', NULL, NULL, 'fa-file-text', '4', 1, NULL, 1, 1, NULL);
INSERT INTO `user_widget` VALUES (4, 1, '明日预计到货', 5, 'info', NULL, NULL, 'fa-lightbulb', '4', 1, NULL, 1, 4, NULL);
INSERT INTO `user_widget` VALUES (5, 1, '项目任务', 1, '#23b7e5', NULL, NULL, 'fa-cubes', '', 2, NULL, 1, 3, '{\"permission\":\"department\",\"date\":\"year\"}');
INSERT INTO `user_widget` VALUES (18, 1, '未读公告', 2, '#7266ba', NULL, NULL, 'fa-bell-o', NULL, 2, NULL, 1, 44, '{\"permission\":\"department\",\"date\":\"month\"}');
INSERT INTO `user_widget` VALUES (21, 1, '新闻公告', 1, '#0066FF', 'article/article/index', NULL, 'fa-bell-o', NULL, 3, NULL, NULL, 6, NULL);
INSERT INTO `user_widget` VALUES (22, 1, '日程管理', 2, '#33CC33', 'calendar/calendar/index', NULL, 'fa-calendar', NULL, 3, NULL, NULL, 57, NULL);
INSERT INTO `user_widget` VALUES (23, 1, '项目管理', 3, '#6666FF', 'project/project/index', NULL, 'fa-cube', NULL, 3, NULL, NULL, 224, NULL);
INSERT INTO `user_widget` VALUES (24, 1, '应用管理', 4, '#FF3399', 'model/bill/index', NULL, 'fa-cubes', NULL, 3, NULL, NULL, 1293, NULL);
INSERT INTO `user_widget` VALUES (25, 6, '待办事项', 1, 'default', NULL, NULL, NULL, '8', 1, NULL, 1, 34, NULL);
INSERT INTO `user_widget` VALUES (26, 6, '待办流程', 2, 'info', NULL, NULL, 'fa-pencil', '8', 1, NULL, 1, 2, NULL);
INSERT INTO `user_widget` VALUES (27, 6, '订单统计', 3, 'info', NULL, NULL, 'fa-file-text', '4', 1, NULL, 1, 1, NULL);
INSERT INTO `user_widget` VALUES (28, 6, '项目任务', 1, 'info', NULL, NULL, 'fa-cubes', NULL, 2, NULL, 1, 3, '{\"permission\":\"dept\",\"date\":\"month\"}');
INSERT INTO `user_widget` VALUES (29, 6, '新增公告', 2, 'primary', NULL, NULL, 'fa-bell-o', NULL, 2, NULL, 1, 44, '{\"permission\":\"dept\",\"date\":\"month\"}');
INSERT INTO `user_widget` VALUES (30, 8, '待办事项', 1, 'default', NULL, NULL, NULL, '8', 1, NULL, 1, 34, NULL);
INSERT INTO `user_widget` VALUES (31, 8, '待办流程', 2, 'info', NULL, NULL, 'fa-pencil', '4', 1, NULL, 1, 2, NULL);
INSERT INTO `user_widget` VALUES (32, 8, '项目任务', 1, 'info', NULL, NULL, 'fa-cubes', NULL, 2, NULL, 1, 3, NULL);
INSERT INTO `user_widget` VALUES (33, 8, '新增公告', 2, 'primary', NULL, NULL, 'fa-bell-o', NULL, 2, NULL, 1, 44, NULL);
INSERT INTO `user_widget` VALUES (34, 1, '客户生日', 2, 'info', NULL, NULL, 'fa-email', '8', 1, NULL, 1, 25, NULL);
INSERT INTO `user_widget` VALUES (35, 1, '最新公告', 4, 'info', NULL, NULL, 'fa-sound_none', '4', 1, NULL, 1, 5, NULL);
-- ----------------------------
-- Table structure for warehouse
@ -11434,7 +11423,7 @@ CREATE TABLE `warehouse` (
INDEX `idx_warehouse_parent_id`(`parent_id`) USING BTREE,
INDEX `idx_warehouse_status`(`status`) USING BTREE,
INDEX `idx_warehouse_name`(`name`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 20056 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '产品分类表名' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 20057 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '产品分类表名' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of warehouse
@ -11452,6 +11441,7 @@ INSERT INTO `warehouse` VALUES (20051, '79', 0, 0, 0, 0, 1, '特价库', NULL, 1
INSERT INTO `warehouse` VALUES (20053, '02', NULL, NULL, NULL, NULL, NULL, '辅料库', NULL, NULL, 1587584650, '系统管理员', '系统管理员', 1587584729, 1, NULL, 1, 1);
INSERT INTO `warehouse` VALUES (20054, '82', NULL, NULL, NULL, NULL, NULL, '样品库', NULL, NULL, 1589868753, '系统管理员', '系统管理员', 1612835832, 1, NULL, 1, 1);
INSERT INTO `warehouse` VALUES (20055, '25', NULL, NULL, NULL, NULL, NULL, '成品待检验库', NULL, NULL, 1614448583, '系统管理员', NULL, NULL, 1, NULL, 1, NULL);
INSERT INTO `warehouse` VALUES (20056, '01', NULL, NULL, NULL, NULL, NULL, '123', NULL, NULL, 1624570903, '系统管理员', NULL, NULL, 1, NULL, 1, NULL);
-- ----------------------------
-- Table structure for warehouse_location
@ -11713,11 +11703,11 @@ CREATE TABLE `widget` (
-- Records of widget
-- ----------------------------
INSERT INTO `widget` VALUES (1, '订单统计', 'info', 1, 2, 'order/widget/index', 'order/order/index', 'd27,d28,d3,d6,d9,d1,d17,d20,d18,d21,d2,d16,d11,d4,d7,d19,d10', '运营采购部,原辅料采购部,采购部,公共关系部,技术中心,董事办,营销中心,销售部,客服部,市场部,财务部,生产部,品管部,仓储物流部,国际贸易部,网络营销部,研发部', 1, 1, 'fa-file-text', '系统管理员', 1613203955, NULL, NULL, 1, NULL, 'widget_order_index', 4);
INSERT INTO `widget` VALUES (3, '项目任务', 'info', 2, 10, 'project/widget/info', 'project/project/index', 'all', '全体人员', 1, 1, 'fa-cubes', '系统管理员', 1613209678, NULL, NULL, 1, NULL, 'info_project_task', NULL);
INSERT INTO `widget` VALUES (3, '项目任务', '#0066FF', 2, 10, 'project/widget/info', 'project/project/index', 'all', '全体人员', 1, 1, 'fa-cubes', '赵云', 1625350331, NULL, NULL, 3, NULL, 'info_project_task', 8);
INSERT INTO `widget` VALUES (4, '明日预计到货', 'info', 1, 4, 'order/widget/goods', 'order/order/delivery', 'd27,d28,d3,d9,d1,d20,d18,d21,d2,d16,d11,d4,d7,d19,d10', '运营采购部,原辅料采购部,采购部,技术中心,董事办,销售部,客服部,市场部,财务部,生产部,品管部,仓储物流部,国际贸易部,网络营销部,研发部', 1, 1, 'fa-lightbulb', '系统管理员', 1613203955, NULL, NULL, 1, NULL, 'widget_order_goods', 4);
INSERT INTO `widget` VALUES (5, '最新公告', 'info', 1, 5, 'article/widget/index', 'article/article/index', 'all', '全体人员', 1, 1, 'fa-sound_none', '系统管理员', 1623146465, NULL, NULL, 1, NULL, 'widget_article_index', 8);
INSERT INTO `widget` VALUES (5, '最新公告', 'info', 1, 5, 'article/widget/index', 'article/article/index', 'all', '全体人员', 1, 1, 'fa-sound_none', '赵云', 1625351430, NULL, NULL, 3, NULL, 'widget_article_index', 8);
INSERT INTO `widget` VALUES (25, '客户生日', 'info', 1, 9, 'customer/widget/birthday', 'customer/customer/birthday', 'all', '全体人员', 1, 1, 'fa-email', '系统管理员', 1623146458, NULL, NULL, 1, NULL, 'widget_customer_birthday', 8);
INSERT INTO `widget` VALUES (34, '待办事项', 'default', 1, 0, 'model/todo/widget', 'model/todo/index', 'all', '全体人员', 1, 1, NULL, '系统管理员', 1613203955, NULL, NULL, 1, NULL, 'widget_model_todo', 8);
INSERT INTO `widget` VALUES (44, '新增公告', 'primary', 2, 10, 'article/widget/info', 'article/article/index', 'all', '全体人员', 1, 1, 'fa-bell-o', '系统管理员', 1613209050, NULL, NULL, 1, NULL, 'info_article_index', NULL);
INSERT INTO `widget` VALUES (44, '未读公告', '#FF9900', 2, 10, 'article/widget/info', 'article/article/index', 'all', '全体人员', 1, 1, 'fa-bell-o', '赵云', 1625350931, NULL, NULL, 3, NULL, 'info_article_index', 8);
SET FOREIGN_KEY_CHECKS = 1;

View File

@ -0,0 +1,47 @@
/*
Navicat Premium Data Transfer
Source Server : localhost_3308
Source Server Type : MySQL
Source Server Version : 100508
Source Host : localhost:3308
Source Schema : gdoo_demo
Target Server Type : MySQL
Target Server Version : 100508
File Encoding : 65001
Date: 28/07/2021 04:51:07
*/
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for share
-- ----------------------------
DROP TABLE IF EXISTS `share`;
CREATE TABLE `share` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`source_id` int(11) NOT NULL,
`source_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
`is_repeat` tinyint(3) NOT NULL DEFAULT 0 COMMENT '重复标记',
`receive_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '共享编号',
`receive_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '共享名称',
`permissions` smallint(6) NULL DEFAULT NULL,
`start_at` int(11) NULL DEFAULT NULL COMMENT '开始时间',
`end_at` int(11) NULL DEFAULT NULL COMMENT '结束时间',
`created_by` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
`created_id` int(11) NULL DEFAULT NULL,
`created_at` int(10) NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE,
INDEX `idx_source_id`(`source_id`) USING BTREE,
INDEX `idx_source_type`(`source_type`) USING BTREE,
INDEX `idx_is_repeat`(`is_repeat`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of share
-- ----------------------------
SET FOREIGN_KEY_CHECKS = 1;