diff --git a/app/contract/view/index/index.html b/app/contract/view/index/index.html index 79eebb4..5d84c5a 100644 --- a/app/contract/view/index/index.html +++ b/app/contract/view/index/index.html @@ -40,7 +40,7 @@ {/block} diff --git a/app/contract/view/index/view_set.html b/app/contract/view/index/view_set.html index c4a48d9..b9064dc 100644 --- a/app/contract/view/index/view_set.html +++ b/app/contract/view/index/view_set.html @@ -13,18 +13,6 @@ html{background-color:#fff;} .log-item i{font-weight:800; color:#323232} .log-content strong{margin:0 4px; color:#323232} -.file-card {background: #fff;border: 1px solid #f1f1f1;border-radius: 2px; padding:8px 0; margin:4px 8px 4px 0; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - display: -webkit-box; - display: -ms-flexbox; - display: flex; -} -.file-card .file-icon{font-size:36px; color:#646464; margin-right: 4px;} -.file-card .file-title {font-size: 12px; letter-spacing: 0; margin-right: 8px; line-height: 16px; word-break: break-all; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; line-clamp: 2; -webkit-box-orient: vertical;width: calc(100% - 108px);} -.file-card .file-tool .layui-icon{font-size:20px; padding:2px; cursor:pointer;} - .check-items{overflow-x: auto; padding: 2px 0;} .flow-flex-row {box-direction: row; box-orient: horizontal; diff --git a/app/customer/validate/CustomerCheck.php b/app/customer/validate/CustomerCheck.php index 490c3d7..3932791 100644 --- a/app/customer/validate/CustomerCheck.php +++ b/app/customer/validate/CustomerCheck.php @@ -17,8 +17,8 @@ class CustomerCheck extends Validate ]; protected $message = [ - 'name.require' => '合同名称不能为空', - 'name.unique' => '同样的合同名称已经存在', + 'name.require' => '客户名称不能为空', + 'name.unique' => '同样的客户名称已经存在', 'id.require' => '缺少更新条件', ]; diff --git a/app/customer/view/index/index.html b/app/customer/view/index/index.html index 8f40a19..838e69f 100644 --- a/app/customer/view/index/index.html +++ b/app/customer/view/index/index.html @@ -58,7 +58,7 @@ {/block} diff --git a/app/customer/view/index/view.html b/app/customer/view/index/view.html index 78ccfca..dad41f8 100644 --- a/app/customer/view/index/view.html +++ b/app/customer/view/index/view.html @@ -2,22 +2,6 @@ {block name="style"} diff --git a/app/finance/view/invoice/add.html b/app/finance/view/invoice/add.html index 7230b8b..87b7a1b 100644 --- a/app/finance/view/invoice/add.html +++ b/app/finance/view/invoice/add.html @@ -5,21 +5,6 @@ .layui-table-min td{font-size:13px; padding:6px;text-align:center;} .layui-form-radio{margin-right:6px} .layui-form-radio>i{margin-right:3px; } -.file-card {background: #fff;border: 1px solid #f1f1f1;border-radius: 2px; padding:8px 0; margin:4px 8px 4px 0; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - display: -webkit-box; - display: -ms-flexbox; - display: flex; -} -.file-card .file-icon{font-size:36px; color:#646464; margin-right: 4px;} -.file-card .file-title {font-size: 12px; letter-spacing: 0; margin-right: 8px; line-height: 16px; word-break: break-all; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; - -webkit-line-clamp: 2; - line-clamp: 2; - -webkit-box-orient: vertical;width: calc(100% - 110px); -} -.file-card .file-tool .layui-icon{font-size:22px; padding:2px; cursor:pointer;} {/block} diff --git a/app/install/data/gouguoa.sql b/app/install/data/gouguoa.sql index ea539b8..9135b6b 100644 --- a/app/install/data/gouguoa.sql +++ b/app/install/data/gouguoa.sql @@ -417,10 +417,10 @@ CREATE TABLE `oa_data_auth` ( -- ---------------------------- -- Records of oa_data_auth -- ---------------------------- -INSERT INTO `oa_data_auth` VALUES (1, '财务管理员','finance_admin','拥有该权限的员工开具发票、报销打款、财务到账。', 'customer', '',0,0,0,'','','',1656143065, 0); +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 (4, '项目管理员','project_admin','拥有该权限的员工可以查看所有项目。', 'contract', '',0,0,0,'立项阶段|实施阶段|验收阶段|交付阶段','','',1656143065, 0); +INSERT INTO `oa_data_auth` VALUES (4, '项目管理员','project_admin','拥有该权限的员工可以查看所有项目。', 'project', '',0,0,0,'立项阶段|实施阶段|验收阶段|交付阶段','','',1656143065, 0); -- ---------------------------- -- Table structure for oa_config diff --git a/app/oa/view/approve/view_style.html b/app/oa/view/approve/view_style.html index 21a524a..41f99a4 100644 --- a/app/oa/view/approve/view_style.html +++ b/app/oa/view/approve/view_style.html @@ -6,22 +6,6 @@ .layui-form-item:hover .layui-btn-danger{display:inline-block;} .select-1,.select-2{display:none;} -.file-card {background: #fff;border: 1px solid #f1f1f1;border-radius: 2px; padding:8px 0; margin:4px 8px 4px 0; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - display: -webkit-box; - display: -ms-flexbox; - display: flex; -} -.file-card .file-icon{font-size:36px; color:#646464; margin-right: 4px;} -.file-card .file-title {font-size: 12px; letter-spacing: 0; margin-right: 8px; line-height: 16px; word-break: break-all; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; - -webkit-line-clamp: 2; - line-clamp: 2; - -webkit-box-orient: vertical;width: calc(100% - 80px); -} -.file-card .file-tool .layui-icon{font-size:22px; padding:2px; cursor:pointer;} - .log-timeline{ position: relative; min-height:600px; padding-left: 48px; background-color:#fff;} .log-timeline:after {content: ""; position: absolute; top: 0; left: 24px; width: 1px; height: 100%; background: #e3e9ed;} .log-timeline dl{padding-bottom: 8px; position: relative;}