-
{:__('Add')}
+
{:__('Add')}
diff --git a/application/command.php b/application/command.php
index 92c2963..20b7957 100755
--- a/application/command.php
+++ b/application/command.php
@@ -22,8 +22,11 @@ return [
'app\admin\command\ImportServiceItems',
'app\admin\command\Test',
- 'app\common\command\UpdateWorkerManCommand', //更新师傅评分
- 'app\common\command\CheckOrderDispatchCommand', //检测超时的任务
- 'app\common\command\CheckOrderDispatchGotCommand', //dispatch未接单通知
- 'app\common\command\CheckOrdeRecordCommand', //跟进记录
+ 'app\common\command\UpdateWorkerManCommand',
+ 'app\common\command\CheckOrderDispatchCommand',
+ 'app\common\command\CheckOrdeRecordCommand',
+ 'app\common\command\CheckSmsPlantCommand',
+ 'app\common\command\CheckTTSOverTimeCommand',
+ 'app\common\command\CheckTTSTaskCommand',
+ 'app\common\command\UpdateWorkerManCommand',
];
diff --git a/application/common/Logic/NoticeLogic.php b/application/common/Logic/NoticeLogic.php
index 51e94b6..8f95ad4 100644
--- a/application/common/Logic/NoticeLogic.php
+++ b/application/common/Logic/NoticeLogic.php
@@ -51,24 +51,25 @@ class NoticeLogic
$log->status = -1;
$log->content = 'TTSID为空';
$log->save();
+ return;
}
- $log->status = 1;
- $log->save();
- return;
+ $status = config('alibaba_dyvms.status');
- $reponse = DyvmsService::getInstance()->call($dispatch->worker_tel, $ttsCode, md5(time()));
+ if($status){
+ $reponse = DyvmsService::getInstance()->call($dispatch->worker_tel, $ttsCode, md5(time()));
-
-
- if($reponse->statusCode == 200 && $reponse->body->code == 'OK'){
- $log->status = 1;
- $log->callId = $reponse->body->callId;
- $log->save();
+ if($reponse->statusCode == 200 && $reponse->body->code == 'OK'){
+ $log->status = 1;
+ $log->callId = $reponse->body->callId;
+ $log->save();
+ }else{
+ $log->status = -1;
+ $log->content = $reponse->body->message;
+ $log->save();
+ }
}else{
- $log->status = -1;
- $log->content = $reponse->body->message;
- $log->save();
+ throw new Exception('语音通知服务未开启');
}
}catch (Exception $exception){
$log->status = -1;
diff --git a/application/common/command/CheckOrdeRecordCommand.php b/application/common/command/CheckOrdeRecordCommand.php
index 70ad812..4c7f45e 100644
--- a/application/common/command/CheckOrdeRecordCommand.php
+++ b/application/common/command/CheckOrdeRecordCommand.php
@@ -23,7 +23,6 @@ class CheckOrdeRecordCommand extends Command
protected function execute(Input $input, Output $output){
$Model = new OrderDispatchRecord();
$now = date('Y-m-d H:i:s');
-
$Model->where('notice_time','<=',$now)
->where('status',0)
->chunk(100, function ($list) {
@@ -44,7 +43,9 @@ class CheckOrdeRecordCommand extends Command
}
}
OrderDispatchRecord::whereIn('id',$ids)->where('status',0)->update(['status'=>1]);
- OrderDispatch::whereIn('id',$dispatchIds)->where('follow',1)->update(['follow'=>0]);
+ $count = OrderDispatch::whereIn('id',$dispatchIds)->where('follow',1)->update(['follow'=>0]);
+
+ echo 'count:'.$count.PHP_EOL;
});
$output->info('OVER');
diff --git a/public/assets/js/backend/oa/custom_schedule.js b/public/assets/js/backend/oa/custom_schedule.js
new file mode 100644
index 0000000..a09e540
--- /dev/null
+++ b/public/assets/js/backend/oa/custom_schedule.js
@@ -0,0 +1,155 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'editable'], function ($, undefined, Backend, Table, Form) {
+
+ var Controller = {
+ index: function () {
+ // 初始化表格参数配置
+ Table.api.init({
+ extend: {
+ index_url: 'oa/custom_schedule/index' + location.search,
+ // add_url: 'oa/schedule/add',
+ editable: 'oa/custom_schedule/editable',
+ // del_url: 'oa/schedule/del',
+ // multi_url: 'oa/schedule/multi',
+ // import_url: 'oa/schedule/import',
+ table: 'schedule',
+ }
+ });
+
+ var table = $("#table");
+
+ var defaultColumnArr = [];
+ defaultColumnArr.push({
+ "title":"用户名",
+ "field":"name",
+ },{
+ "title":"用户id",
+ "field":"admin_id",
+ "visible":false
+ });
+
+ const startDate = new Date();
+ startDate.setDate(1);
+ startDate.setHours(0, 0, 0, 0);
+
+ const endDate = new Date(startDate.getFullYear(), startDate.getMonth() + 1, 0);
+ endDate.setHours(0, 0, 0, 0);
+
+ for (let d = new Date(startDate); d <= endDate; ) {
+ const current = new Date(d); // 深拷贝
+ const tmpDate = current.toLocaleDateString('sv-SE');
+
+ console.log('Current Date:', tmpDate);
+ defaultColumnArr.push({
+ "title": tmpDate,
+ "field": tmpDate,
+ "editable" :{
+ type: 'select',
+ pk: 1,
+ source: [
+ {value: '无', text: '无'},
+ {value: '早班', text: '早班'},
+ {value: '中班', text: '中班'},
+ {value: '晚班', text: '晚班'},
+ {value: '行政班', text: '行政班'},
+ ],
+ noeditFormatter: function (value, row, index) {
+ if (row.editable === 1) {
+ return false;
+ } else {
+ return value;
+ }
+ },
+ }
+ });
+
+ d.setDate(d.getDate() + 1); // 最后再改 d 的值
+ }
+
+ // 初始化表格
+ table.bootstrapTable({
+ url: $.fn.bootstrapTable.defaults.extend.index_url,
+ columns: defaultColumnArr,
+ searchFormVisible: true,
+ searchFormTemplate: 'customformtpl',
+ });
+
+ // 为表格绑定事件
+ Table.api.bindevent(table);
+
+ $(document).on("click", ".btn-block", function () {
+
+ let selectedValue = $('#c-flag').val();
+
+ let changeColumn = [];
+ if (selectedValue == 2) {
+ changeColumn = [{
+ "title":"用户名",
+ "field":"name",
+ },{
+ "title":"用户id",
+ "field":"admin_id",
+ "visible":false
+ }];
+
+ const today = new Date();
+ const startDate = new Date(today.setDate(today.getDate() - today.getDay() + 1)); // 星期一
+ const endDate = new Date(today.setDate(today.getDate() - today.getDay() + 7)); // 星期天
+
+ for (let d = new Date(startDate); d <= endDate; d.setDate(d.getDate() + 1)) {
+ let tmpDate = d.toISOString().split('T')[0]; // 使用 d，而不是 date
+ changeColumn.push({
+ "title": tmpDate,
+ "field": tmpDate,
+ "editable" :{
+ type: 'select',
+ pk: 1,
+ source: [
+ {value: '无', text: '无'},
+ {value: '早班', text: '早班'},
+ {value: '中班', text: '中班'},
+ {value: '晚班', text: '晚班'},
+ {value: '行政班', text: '行政班'},
+ ]
+ }
+ });
+ }
+
+ } else {
+ changeColumn = defaultColumnArr;
+ }
+
+ var options = table.bootstrapTable('getOptions');
+ var queryParams = options.queryParams;
+ options.queryParams = function (params) {
+ //这一行必须要存在,否则在点击下一页时会丢失搜索栏数据
+ params = queryParams(params);
+
+ var filter = params.filter ? JSON.parse(params.filter) : {};
+ filter.timetype = selectedValue;
+
+ params.filter = JSON.stringify(filter);
+ return params;
+ };
+
+ table.bootstrapTable('refreshOptions', {
+ columns: changeColumn,
+ });
+
+ $('#c-flag').val(selectedValue).change();
+ return false;
+ });
+ },
+ add: function () {
+ Controller.api.bindevent();
+ },
+ edit: function () {
+ Controller.api.bindevent();
+ },
+ api: {
+ bindevent: function () {
+ Form.api.bindevent($("form[role=form]"));
+ }
+ }
+ };
+ return Controller;
+});
diff --git a/public/assets/js/backend/oa/schedule.js b/public/assets/js/backend/oa/schedule.js
index 777dd23..79aee53 100644
--- a/public/assets/js/backend/oa/schedule.js
+++ b/public/assets/js/backend/oa/schedule.js
@@ -39,144 +39,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'editable'], function
// 为表格绑定事件
Table.api.bindevent(table);
},
- custom_index: function () {
- // 初始化表格参数配置
- Table.api.init({
- extend: {
- index_url: 'oa/schedule/custom_index' + location.search,
- // add_url: 'oa/schedule/add',
- editable: 'oa/schedule/editable',
- // del_url: 'oa/schedule/del',
- // multi_url: 'oa/schedule/multi',
- // import_url: 'oa/schedule/import',
- table: 'schedule',
- }
- });
-
- var table = $("#table");
-
- var defaultColumnArr = [];
- defaultColumnArr.push({
- "title":"用户名",
- "field":"name",
- },{
- "title":"用户id",
- "field":"admin_id",
- "visible":false
- });
-
- const startDate = new Date();
- startDate.setDate(1);
- startDate.setHours(0, 0, 0, 0);
-
- const endDate = new Date(startDate.getFullYear(), startDate.getMonth() + 1, 0);
- endDate.setHours(0, 0, 0, 0);
-
- for (let d = new Date(startDate); d <= endDate; ) {
- const current = new Date(d); // 深拷贝
- const tmpDate = current.toLocaleDateString('sv-SE');
-
- console.log('Current Date:', tmpDate);
- defaultColumnArr.push({
- "title": tmpDate,
- "field": tmpDate,
- "editable" :{
- type: 'select',
- pk: 1,
- source: [
- {value: '无', text: '无'},
- {value: '早班', text: '早班'},
- {value: '中班', text: '中班'},
- {value: '晚班', text: '晚班'},
- {value: '行政班', text: '行政班'},
- ],
- noeditFormatter: function (value, row, index) {
- if (row.editable === 1) {
- return false;
- } else {
- return value;
- }
- },
- }
- });
-
- d.setDate(d.getDate() + 1); // 最后再改 d 的值
- }
-
- // 初始化表格
- table.bootstrapTable({
- url: $.fn.bootstrapTable.defaults.extend.index_url,
- columns: defaultColumnArr,
- searchFormVisible: true,
- searchFormTemplate: 'customformtpl',
- });
-
- // 为表格绑定事件
- Table.api.bindevent(table);
-
- $(document).on("click", ".btn-block", function () {
-
- let selectedValue = $('#c-flag').val();
-
- let changeColumn = [];
- if (selectedValue == 2) {
- changeColumn = [{
- "title":"用户名",
- "field":"name",
- },{
- "title":"用户id",
- "field":"admin_id",
- "visible":false
- }];
-
- const today = new Date();
- const startDate = new Date(today.setDate(today.getDate() - today.getDay() + 1)); // 星期一
- const endDate = new Date(today.setDate(today.getDate() - today.getDay() + 7)); // 星期天
-
- for (let d = new Date(startDate); d <= endDate; d.setDate(d.getDate() + 1)) {
- let tmpDate = d.toISOString().split('T')[0]; // 使用 d，而不是 date
- changeColumn.push({
- "title": tmpDate,
- "field": tmpDate,
- "editable" :{
- type: 'select',
- pk: 1,
- source: [
- {value: '无', text: '无'},
- {value: '早班', text: '早班'},
- {value: '中班', text: '中班'},
- {value: '晚班', text: '晚班'},
- {value: '行政班', text: '行政班'},
- ]
- }
- });
- }
-
- } else {
- changeColumn = defaultColumnArr;
- }
-
- var options = table.bootstrapTable('getOptions');
- var queryParams = options.queryParams;
- options.queryParams = function (params) {
- //这一行必须要存在,否则在点击下一页时会丢失搜索栏数据
- params = queryParams(params);
-
- var filter = params.filter ? JSON.parse(params.filter) : {};
- filter.timetype = selectedValue;
-
- params.filter = JSON.stringify(filter);
- return params;
- };
-
- table.bootstrapTable('refreshOptions', {
- columns: changeColumn,
- });
-
- $('#c-flag').val(selectedValue).change();
- return false;
- });
- },
add: function () {
Controller.api.bindevent();
},
diff --git a/public/assets/js/backend/salary/custom_detail.js b/public/assets/js/backend/salary/custom_detail.js
new file mode 100644
index 0000000..869dbb7
--- /dev/null
+++ b/public/assets/js/backend/salary/custom_detail.js
@@ -0,0 +1,127 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+ var Controller = {
+ index: function () {
+// 初始化表格参数配置
+ Table.api.init({
+ extend: {
+ index_url: 'salary/custom_detail/index' + location.search,
+ add_url: 'salary/custom_detail/add',
+ // del_url: 'oa/schedule/del',
+ // multi_url: 'oa/schedule/multi',
+ // import_url: 'oa/schedule/import',
+ table: 'salary',
+ }
+ });
+
+ var table = $("#table");
+
+ var defaultColumnArr = [];
+ defaultColumnArr.push({
+ "title":"用户名",
+ "field":"name",
+ },{
+ "title":"用户id",
+ "field":"target_admin_id",
+ "visible":false
+ });
+
+
+ // 获取后端传入的字段定义（JSON 字符串）
+
+ var columnJson = $('#salaryitem').val();
+ var rawColumns = JSON.parse(columnJson);
+ rawColumns.forEach(function (item) {
+ // 可以加入格式化、样式控制等逻辑
+ defaultColumnArr.push({
+ field: item.id,
+ title: item.name,
+ });
+ });
+
+ defaultColumnArr.push({
+ field: 'operate',
+ title: __('Operate'),
+ table: table,
+ buttons: [
+ {
+ name: 'myedit',
+ text: '编辑',
+ title: '编辑',
+ classname: 'btn btn-xs btn-success btn-dialog',
+ icon: 'fa fa-edit',
+ url: function (row) {
+ // 注意这里拼接 admin_id 和 month
+ return 'salary/custom_detail/edit?target_admin_id=' + row.target_admin_id + '&month=' + row.month;
+ },
+ extend: 'data-area=\'["800px", "600px"]\'',
+ visible:function(row){
+ if (!Config.manage) {
+ return false;
+ }
+ return true;
+ }
+ },
+ {
+ name: 'complete',
+ text:"结算",
+ title:"结算",
+ extend: 'data-toggle="tooltip" data-container="body"',
+ classname: 'btn btn-xs btn-success btn-magic btn-ajax',
+ icon: 'fa fa-cny',
+ url: function (row) {
+ // 注意这里拼接 admin_id 和 month
+ return 'salary/detail/settle?target_admin_id=' + row.target_admin_id + '&month=' + row.month;
+ },
+ confirm: '确认结算?',
+ refresh: true,
+ success: function (data, ret) {
+ $("#table").bootstrapTable('refresh');
+ return false;
+ },
+ error: function (data, ret) {
+ Layer.alert(ret.msg);
+ return false;
+ },
+ visible: function (row) {
+ if (!Config.manage) {
+ return false;
+ }
+ //返回true时按钮显示,返回false隐藏
+ if (row.settle_status != 1) {
+ return true;
+ }
+ return false;
+ }
+ },
+ ],
+ events: Table.api.events.operate,
+ formatter: Table.api.formatter.operate
+ });
+
+
+ // 初始化表格
+ table.bootstrapTable({
+ url: $.fn.bootstrapTable.defaults.extend.index_url,
+ columns: defaultColumnArr,
+ searchFormVisible: true,
+ searchFormTemplate: 'customformtpl',
+ });
+
+ // 为表格绑定事件
+ Table.api.bindevent(table);
+ },
+ add: function () {
+ Controller.api.bindevent();
+ },
+ edit: function () {
+ Controller.api.bindevent();
+ },
+ api: {
+ bindevent: function () {
+ Form.api.bindevent($("form[role=form]"));
+ }
+ }
+ };
+ return Controller;
+});
diff --git a/public/assets/js/backend/salary/detail.js b/public/assets/js/backend/salary/detail.js
index eebc6a8..7635019 100644
--- a/public/assets/js/backend/salary/detail.js
+++ b/public/assets/js/backend/salary/detail.js
@@ -41,125 +41,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
// 为表格绑定事件
Table.api.bindevent(table);
},
- custom_index: function () {
- // 初始化表格参数配置
- Table.api.init({
- extend: {
- index_url: 'salary/detail/custom_index' + location.search,
- add_url: 'salary/detail/custom_add',
- // del_url: 'oa/schedule/del',
- // multi_url: 'oa/schedule/multi',
- // import_url: 'oa/schedule/import',
- table: 'salary',
- }
- });
-
- var table = $("#table");
-
- var defaultColumnArr = [];
- defaultColumnArr.push({
- "title":"用户名",
- "field":"name",
- },{
- "title":"用户id",
- "field":"target_admin_id",
- "visible":false
- });
-
-
- // 获取后端传入的字段定义（JSON 字符串）
-
- var columnJson = $('#salaryitem').val();
- var rawColumns = JSON.parse(columnJson);
- rawColumns.forEach(function (item) {
- // 可以加入格式化、样式控制等逻辑
- defaultColumnArr.push({
- field: item.id,
- title: item.name,
- });
- });
-
- defaultColumnArr.push({
- field: 'operate',
- title: __('Operate'),
- table: table,
- buttons: [
- {
- name: 'custom_edit',
- text: '编辑',
- title: '编辑',
- classname: 'btn btn-xs btn-success btn-dialog',
- icon: 'fa fa-edit',
- url: function (row) {
- // 注意这里拼接 admin_id 和 month
- return 'salary/detail/custom_edit?target_admin_id=' + row.target_admin_id + '&month=' + row.month;
- },
- extend: 'data-area=\'["800px", "600px"]\'',
- visible:function(row){
- if (!Config.manage) {
- return false;
- }
- return true;
- }
- },
- {
- name: 'complete',
- text:"结算",
- title:"结算",
- extend: 'data-toggle="tooltip" data-container="body"',
- classname: 'btn btn-xs btn-success btn-magic btn-ajax',
- icon: 'fa fa-cny',
- url: function (row) {
- // 注意这里拼接 admin_id 和 month
- return 'salary/detail/settle?target_admin_id=' + row.target_admin_id + '&month=' + row.month;
- },
- confirm: '确认结算?',
- refresh: true,
- success: function (data, ret) {
- $("#table").bootstrapTable('refresh');
- return false;
- },
- error: function (data, ret) {
- Layer.alert(ret.msg);
- return false;
- },
- visible: function (row) {
- if (!Config.manage) {
- return false;
- }
- //返回true时按钮显示,返回false隐藏
- if (row.settle_status != 1) {
- return true;
- }
- return false;
- }
- },
- ],
- events: Table.api.events.operate,
- formatter: Table.api.formatter.operate
- });
-
-
- // 初始化表格
- table.bootstrapTable({
- url: $.fn.bootstrapTable.defaults.extend.index_url,
- columns: defaultColumnArr,
- searchFormVisible: true,
- searchFormTemplate: 'customformtpl',
- });
-
- // 为表格绑定事件
- Table.api.bindevent(table);
- },
add: function () {
Controller.api.bindevent();
},
- custom_add: function () {
- Controller.api.bindevent();
- },
- custom_edit: function () {
- Controller.api.bindevent();
- },
edit: function () {
Controller.api.bindevent();
},