-
#T{$detail.id}
+
#P{$detail.id}
{$detail.admin_name}
创建于{$detail.times}{gt name="$detail.update_time"
value="0"}，最近更新于 {:time_trans($detail.update_time)}{/gt}
diff --git a/public/static/assets/gougu/module/employeepicker.js b/public/static/assets/gougu/module/employeepicker.js
index b0df9f1..f0ab1c5 100644
--- a/public/static/assets/gougu/module/employeepicker.js
+++ b/public/static/assets/gougu/module/employeepicker.js
@@ -4,6 +4,8 @@ layui.define(['layer','dtree'],function(exports){
var dtree = layui.dtree;
var opts={
"title":'选择员工',
+ "department_url": "/api/index/get_department_tree",
+ "employee_url": "/api/index/get_employee",
"type":1,
"ids":[],
"names":[],
@@ -235,8 +237,6 @@ layui.define(['layer','dtree'],function(exports){
ids:ids,
names:names,
type:0,
- department_url: "/api/index/get_department_tree",
- employee_url: "/api/index/get_employee",
callback:function(ids,names,dids,departments){
that.val(names);
that.next().val(ids);
@@ -256,8 +256,6 @@ layui.define(['layer','dtree'],function(exports){
ids:ids_array,
names:names_array,
type:1,
- department_url: "/api/index/get_department_tree",
- employee_url: "/api/index/get_employee",
callback:function(ids,names,dids,departments){
that.val(names.join(','));
that.next().val(ids.join(','));
diff --git a/public/static/assets/gougu/module/oaEdit.js b/public/static/assets/gougu/module/oaEdit.js
index ec61582..3c84648 100644
--- a/public/static/assets/gougu/module/oaEdit.js
+++ b/public/static/assets/gougu/module/oaEdit.js
@@ -1,9 +1,10 @@
-layui.define(['tool','employeepicker','tinymce'], function (exports) {
+layui.define(['tool','employeepicker','tinymce','oaTool'], function (exports) {
let form = layui.form;
let table = layui.table;
let laydate = layui.laydate;
let dropdown = layui.dropdown;
let employeepicker = layui.employeepicker;
+ let oaTool = layui.oaTool;
let tinymce = layui.tinymce;
let obj = {
//文本
@@ -52,8 +53,6 @@ layui.define(['tool','employeepicker','tinymce'], function (exports) {
employeepicker.init({
ids: real_txt.toString(),
names: show_txt,
- department_url: "/api/index/get_department_tree",
- employee_url: "/api/index/get_employee",
type: 0,
callback: function (ids, names) {
editPost(id, name, names, ids);
@@ -72,61 +71,26 @@ layui.define(['tool','employeepicker','tinymce'], function (exports) {
employeepicker.init({
ids: ids,
names: names,
- department_url: "/api/index/get_department_tree",
- employee_url: "/api/index/get_employee",
type: 1,
callback: function (ids, names) {
editPost(id, name, names.join(','), ids.join(','));
}
});
},
- //ajax表格单选
- select_table: function (id, name, real_val, url, editPost) {
- let that = this;
- let selectTable;
- layer.open({
- title: '请选择',
- area: ['600px', '580px'],
- type: 1,
- content: '
',
- success: function () {
- selectTable = table.render({
- elem: '#selectTable'
- , url: url
- , page: true //开启分页
- , limit: 10
- , cols: [[
- { type: 'radio', title: '选择' }
- , { field: 'id', width: 100, title: '编号', align: 'center' }
- , { field: 'title', title: '项目名称' }
- ]]
- });
- //项目搜索提交
- form.on('submit(search_form)', function (data) {
- selectTable.reload({ where: { keywords: data.field.keywords }, page: { curr: 1 } });
- return false;
- });
- },
- btn: ['确定'],
- yes: function () {
- var checkStatus = table.checkStatus(selectTable.config.id);
- var data = checkStatus.data;
- if (data.length > 0) {
- editPost(id, name, data[0].title, data[0].id);
- }
- else {
- layer.msg('请选择');
- return false;
- }
- }
- })
+ //项目
+ select_table: function (id, name, real_val, editPost) {
+ let callback = function(data){
+ editPost(id, name, data.title, data.id);
+ }
+ oaTool.projectPicker(callback);
+ },
+ //任务
+ select_task: function (id, name, real_val, editPost) {
+ let callback = function(data){
+ console.log(data.id);
+ editPost(id, name, data.title, data.id);
+ }
+ oaTool.taskPicker(callback);
},
//表格单选
select_type: function (id, name, real_val, data, editPost) {
diff --git a/public/static/assets/gougu/module/oaTool.js b/public/static/assets/gougu/module/oaTool.js
index 3f9f8c3..5ea4281 100644
--- a/public/static/assets/gougu/module/oaTool.js
+++ b/public/static/assets/gougu/module/oaTool.js
@@ -17,6 +17,11 @@ layui.define(['tool'], function (exports) {
}
};
+ //是否是对象
+ function isObject(val) {
+ return typeof val === 'object' && val !== null
+ }
+
//格式化文件大小
function renderSize(value){
if(null==value||value==''){
@@ -387,9 +392,9 @@ layui.define(['tool'], function (exports) {
return false;
});
},
- btn: ['确定'],
+ btn: ['确定选择','清除数据'],
btnAlign: 'c',
- yes: function () {
+ btn1: function () {
var checkStatus = table.checkStatus(projectTable.config.id);
var data = checkStatus.data;
if (data.length > 0) {
@@ -400,15 +405,20 @@ layui.define(['tool'], function (exports) {
layer.msg('请先选择项目');
return false;
}
+ },
+ btn2: function () {
+ callback({'id':0,'title':''});
+ layer.closeAll();
}
})
},
//选择任务
- taskPicker:function(project_id,callback){
- var taskTable;
+ taskPicker:function(callback,where){
+ let map = isObject(where)?where:{};
+ let taskTable;
let taskLayer = layer.open({
title: '选择任务',
- area: ['600px', '580px'],
+ area: ['666px', '580px'],
type: 1,
content: '
\