diff --git a/README.md b/README.md
index 1fa2ff0..70c5184 100644
--- a/README.md
+++ b/README.md
@@ -122,7 +122,7 @@ composer install
⚠️⚠️ **注意:安装过程中,系统会自动创建数据库,请确保填写的数据库用户的权限可创建数据库,如果权限不足,请先手动创建空的数据库,然后填写刚创建的数据库名称和用户名也可完成安装。**
-🔺🔺 **提醒:安装过程中,如果进度条卡住,一般都是数据库写入权限或者安装环境配置问题,请注意检查。遇到问题请到QQ群:24641076 反馈**
+🔺🔺 **提醒:安装过程中,如果进度条卡住,一般都是数据库写入权限或者安装环境配置问题,请注意检查。遇到问题请到QQ群反馈:24641076(群一满),46924914(群二名额不多) **
✅✅ **PS:如需要重新安装,请删除目录里面 config/install.lock 的文件,即可重新安装。**
@@ -139,7 +139,7 @@ composer install
5. 访问 http://www.你的域名.com/install/index ,请注意查看伪静态请配置是否设置了thinkphp规则。
-6. 如果遇到无法解决的问题请到QQ群:24641076(群一满),46924914(群二名额不多) 反馈交流 。
+6. 如果遇到无法解决的问题请到QQ群反馈交流:24641076(群一满),46924914(群二名额不多) 。
**📢如果需要提供安装服务,请搜索微信号:hdm588,添加好友,注意备注[安装勾股系统]。开源不易,该服务需友情赞赏💰99元。**
diff --git a/app/common.php b/app/common.php
index fc8971a..f9f6053 100644
--- a/app/common.php
+++ b/app/common.php
@@ -94,6 +94,14 @@ function isTemplate($url='')
return $isTemplate;
}
+//判断模块是否存在
+function isModule($name)
+{
+ $map = [];
+ $map[] = ['name', '=', $name];
+ $count = Db::name('AdminModule')->where($map)->count();
+ return $count;
+}
//是否是某数据权限,count>1即有权限
function isAuth($uid,$name)
{
diff --git a/app/contract/config/install.sql b/app/contract/config/install.sql
index 5a1f535..63e0f5b 100644
--- a/app/contract/config/install.sql
+++ b/app/contract/config/install.sql
@@ -108,4 +108,4 @@ CREATE TABLE `oa_contract_log` (
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COMMENT = '合同操作记录表';
-INSERT INTO `oa_data_auth` VALUES ((SELECT MAX(id) +1 FROM `oa_data_auth` a), '合同管理员','contract_admin','拥有该权限的员工可以查看、编辑、作废、中止所有合同。', 'contract', '',0,0,0,'','','',1656143065, 0);
\ No newline at end of file
+INSERT INTO `oa_data_auth` VALUES ((SELECT MAX(id) +1 FROM `oa_data_auth` a), '合同管理员','contract_admin','拥有该权限的员工可以查看、编辑、作废、中止所有合同。', 'contract', '',1,1,0,'','','',1656143065, 0);
\ No newline at end of file
diff --git a/app/contract/view/index/add.html b/app/contract/view/index/add.html
index b3019b2..7b0014d 100644
--- a/app/contract/view/index/add.html
+++ b/app/contract/view/index/add.html
@@ -50,11 +50,19 @@
客户名称(甲方)* |
{gt name="$pid" value="0"}
-
+
+
{else/}
-
+
+ {if condition="(isModule('customer') > 0) AND ($is_customer == 1)"}
+
+
+ {else/}
+
+
+ {/if}
+
{/gt}
-
|
签约客户代表* |
diff --git a/app/contract/view/index/edit.html b/app/contract/view/index/edit.html
index 351fa21..41e7c6c 100644
--- a/app/contract/view/index/edit.html
+++ b/app/contract/view/index/edit.html
@@ -48,7 +48,12 @@
客户名称(甲方)* |
-
+ {if condition="(isModule('customer') > 0) AND ($is_customer == 1)"}
+
+ {else/}
+
+ {/if}
+
|
签约客户代表 |
diff --git a/app/customer/view/grade/conf.html b/app/customer/view/grade/conf.html
index f52fd11..e239a51 100644
--- a/app/customer/view/grade/conf.html
+++ b/app/customer/view/grade/conf.html
@@ -59,7 +59,7 @@
let callback = function (e) {
layer.msg(e.msg);
}
- tool.post("/contract/cate/conf", data.field, callback);
+ tool.post("/customer/grade/conf", data.field, callback);
return false;
});
}
diff --git a/app/finance/view/expense/conf.html b/app/finance/view/expense/conf.html
index a29345a..e1197f5 100644
--- a/app/finance/view/expense/conf.html
+++ b/app/finance/view/expense/conf.html
@@ -66,7 +66,7 @@
let callback = function (e) {
layer.msg(e.msg);
}
- tool.post("/contract/cate/conf", data.field, callback);
+ tool.post("/finance/expense/conf", data.field, callback);
return false;
});
}
diff --git a/app/finance/view/income/add.html b/app/finance/view/income/add.html
index fdab89b..20cbd9c 100644
--- a/app/finance/view/income/add.html
+++ b/app/finance/view/income/add.html
@@ -110,9 +110,9 @@
{elseif condition="($detail.check_status == 2)"}
审核通过,待开具
{elseif condition="($detail.check_status == 3)"}
- 审核不通过 【原因:{$detail.check_remark}】
+ 审核不通过
{elseif condition="($detail.check_status == 4)"}
- 已撤销 【原因:{$detail.check_remark}】
+ 已撤销
{elseif condition="($detail.check_status == 5)"}
已开具
{elseif condition="($detail.check_status == 10)"}
diff --git a/app/finance/view/income/view.html b/app/finance/view/income/view.html
index 4bdf190..e89b54a 100644
--- a/app/finance/view/income/view.html
+++ b/app/finance/view/income/view.html
@@ -69,9 +69,9 @@
{elseif condition="($detail.check_status == 2)"}
审核通过,待开具
{elseif condition="($detail.check_status == 3)"}
- 审核不通过 【原因:{$detail.check_remark}】
+ 审核不通过
{elseif condition="($detail.check_status == 4)"}
- 已撤销 【原因:{$detail.check_remark}】
+ 已撤销
{elseif condition="($detail.check_status == 5)"}
已开具
{elseif condition="($detail.check_status == 10)"}
diff --git a/app/finance/view/invoice/add.html b/app/finance/view/invoice/add.html
index 46223ce..487920d 100644
--- a/app/finance/view/invoice/add.html
+++ b/app/finance/view/invoice/add.html
@@ -62,13 +62,15 @@
| 地址 |
|
+ {gt name=":isModule('contract')" value="0"}
- 关联合同 |
+ 关联合同 |
|
+ {/gt}
备注信息 |
|
@@ -156,13 +158,15 @@
地址 |
|
+ {gt name=":isModule('contract')" value="0"}
- 关联合同 |
+ 关联合同 |
|
+ {/gt}
备注信息 |
|
diff --git a/app/finance/view/invoice/view.html b/app/finance/view/invoice/view.html
index 6c88a2b..55d2386 100644
--- a/app/finance/view/invoice/view.html
+++ b/app/finance/view/invoice/view.html
@@ -143,9 +143,9 @@
{elseif condition="($detail.check_status == 2)"}
审核通过,待开具
{elseif condition="($detail.check_status == 3)"}
- 审核不通过 【原因:{$detail.check_remark}】
+ 审核不通过
{elseif condition="($detail.check_status == 4)"}
- 已撤销 【原因:{$detail.check_remark}】
+ 已撤销
{elseif condition="($detail.check_status == 5)"}
已开具
{elseif condition="($detail.check_status == 10)"}
diff --git a/app/home/view/index/main.html b/app/home/view/index/main.html
index 956e0d4..09be121 100644
--- a/app/home/view/index/main.html
+++ b/app/home/view/index/main.html
@@ -177,7 +177,8 @@
-
+
+ {gt name=":isModule('project')" value="0"}
+ {/gt}
diff --git a/app/project/config/install.sql b/app/project/config/install.sql
index 4faeda0..228b4fc 100644
--- a/app/project/config/install.sql
+++ b/app/project/config/install.sql
@@ -189,4 +189,4 @@ CREATE TABLE `oa_project_log` (
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COMMENT = '项目任务操作记录表';
-INSERT INTO `oa_data_auth` VALUES ((SELECT MAX(id) +1 FROM `oa_data_auth` a), '项目管理员','project_admin','拥有该权限的员工可以查看所有项目。', 'contract', '',0,0,0,'立项阶段|实施阶段|验收阶段|交付阶段','','',1656143065, 0);
\ No newline at end of file
+INSERT INTO `oa_data_auth` VALUES ((SELECT MAX(id) +1 FROM `oa_data_auth` a), '项目管理员','project_admin','拥有该权限的员工可以查看所有项目。', 'project', '',0,0,0,'立项阶段|实施阶段|验收阶段|交付阶段','','',1656143065, 0);
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 7ff72f9..dfaa7bb 100644
--- a/composer.json
+++ b/composer.json
@@ -1,22 +1,18 @@
{
- "name": "topthink/think",
- "description": "the new thinkphp framework",
+ "name": "gougu/dev",
+ "description": "the gouguoa project",
"type": "project",
"keywords": [
- "framework",
- "thinkphp",
- "ORM"
+ "dev",
+ "oa",
+ "cms"
],
- "homepage": "http://thinkphp.cn/",
- "license": "Apache-2.0",
+ "homepage": "http://www.gougucms.com/",
+ "license": "GPL-3.0",
"authors": [
{
- "name": "liu21st",
- "email": "liu21st@gmail.com"
- },
- {
- "name": "yunwuxin",
- "email": "448901948@qq.com"
+ "name": "dev",
+ "email": "hdm58@qq.com"
}
],
"require": {