diff --git a/app/common.php b/app/common.php index 27309b3..fb1fe72 100644 --- a/app/common.php +++ b/app/common.php @@ -631,6 +631,15 @@ function send_email($to, $subject = '', $content = '') return false; } } + +/** + * 生成时间编号 + * $prefix前缀 + */ +function get_codeno($prefix=1){ + $no = $prefix . date('ymdHis') . rand(10,99); + return $no; +} /** * 截取文章摘要 * @return bool diff --git a/app/contract/controller/Index.php b/app/contract/controller/Index.php index 0a59848..5b6808f 100644 --- a/app/contract/controller/Index.php +++ b/app/contract/controller/Index.php @@ -170,7 +170,13 @@ class Index extends BaseController $type = isset($param['type']) ? $param['type'] : 0; $pid = isset($param['pid']) ? $param['pid'] : 0; $is_customer = Db::name('DataAuth')->where('name','contract_admin')->value('expected_1'); + $is_codeno = Db::name('DataAuth')->where('name','contract_admin')->value('expected_2'); + $codeno=''; + if($is_codeno==1){ + $codeno = get_codeno(1); + } View::assign('is_customer', $is_customer); + View::assign('codeno', $codeno); View::assign('id', $id); View::assign('type', $type); View::assign('pid', $pid); diff --git a/app/contract/view/cate/conf.html b/app/contract/view/cate/conf.html index 2afe1cb..d5828f8 100644 --- a/app/contract/view/cate/conf.html +++ b/app/contract/view/cate/conf.html @@ -5,7 +5,7 @@

权限配置

- - + + + - - + - diff --git a/app/contract/view/index/add.html b/app/contract/view/index/add.html index 5e3b968..b3019b2 100644 --- a/app/contract/view/index/add.html +++ b/app/contract/view/index/add.html @@ -34,7 +34,7 @@ - + diff --git a/app/finance/view/expense/conf.html b/app/finance/view/expense/conf.html index 836b590..a29345a 100644 --- a/app/finance/view/expense/conf.html +++ b/app/finance/view/expense/conf.html @@ -25,24 +25,23 @@ - + - + - + diff --git a/app/install/data/gouguoa.sql b/app/install/data/gouguoa.sql index 07ac51b..8dc7b26 100644 --- a/app/install/data/gouguoa.sql +++ b/app/install/data/gouguoa.sql @@ -420,7 +420,7 @@ CREATE TABLE `oa_data_auth` ( -- ---------------------------- INSERT INTO `oa_data_auth` VALUES (1, '财务管理员','finance_admin','拥有该权限的员工开具发票、报销打款、财务到账。', 'finance', '',0,0,0,'','','',1656143065, 0); INSERT INTO `oa_data_auth` VALUES (2, '客户管理员','customer_admin','拥有该权限的员工可以查看、转移所有客户。', 'customer', '',10,0,0,'','','',1656143065, 0); -INSERT INTO `oa_data_auth` VALUES (3, '合同管理员','contract_admin','拥有该权限的员工可以查看、编辑、作废、中止所有合同。', 'contract', '',0,0,0,'','','',1656143065, 0); +INSERT INTO `oa_data_auth` VALUES (3, '合同管理员','contract_admin','拥有该权限的员工可以查看、编辑、作废、中止所有合同。', 'contract', '',1,1,0,'','','',1656143065, 0); INSERT INTO `oa_data_auth` VALUES (4, '项目管理员','project_admin','拥有该权限的员工可以查看所有项目。', 'project', '',0,0,0,'立项阶段|实施阶段|验收阶段|交付阶段','','',1656143065, 0); -- ---------------------------- @@ -1002,6 +1002,7 @@ CREATE TABLE `oa_note_cate` ( -- ---------------------------- INSERT INTO `oa_note_cate` VALUES (1, 0, 1, '普通公告', 1637984265, 1637984299); INSERT INTO `oa_note_cate` VALUES (2, 0, 2, '紧急公告', 1637984283, 1637984310); +INSERT INTO `oa_note_cate` VALUES (3, 0, 3, '防疫公告', 1637984283, 1637984310); -- ---------------------------- -- Table structure for oa_note diff --git a/app/project/view/index/conf.html b/app/project/view/index/conf.html index 6b79a58..f7a56f8 100644 --- a/app/project/view/index/conf.html +++ b/app/project/view/index/conf.html @@ -32,11 +32,10 @@ - +
+

合同模块使用说明：

1、设置合同管理员，可设置多个

a、拥有合同管理员权限的员工可以查看、编辑、作废、中止所有合同。

@@ -30,19 +30,25 @@ 		权限标识 {$detail.name} 开启关联客户 - + + + 合同编号自动生成 + + +
权限人员* - + 权限人员 - +
+ {$detail.desc}
合同编号* - + 合同类别* diff --git a/app/customer/view/grade/conf.html b/app/customer/view/grade/conf.html index 07b06a1..f52fd11 100644 --- a/app/customer/view/grade/conf.html +++ b/app/customer/view/grade/conf.html @@ -27,11 +27,10 @@
权限人员* - 权限人员 - +
{$detail.name}
报销管理员* - 报销管理员 - +
发票管理员*发票管理员 - +
到账管理员*到账管理员 - +
权限人员* - 权限人员 - +