diff --git a/back/application/api/controller/Contract.php b/back/application/api/controller/Contract.php index 419431d..ad2665a 100644 --- a/back/application/api/controller/Contract.php +++ b/back/application/api/controller/Contract.php @@ -239,7 +239,7 @@ class Contract extends Common if (!isset($param['contract_url']) || $param['contract_url'] == '') { $insert_info['contract_url'] = ''; } else { - $insert_info['contract_url'] = $param['cosssntract_url']; + $insert_info['contract_url'] = $param['contract_url']; // 同理，contract_file_name 也建议做存在性检查，避免同理报错 $insert_info['contract_file_name'] = isset($param['contract_file_name']) ? $param['contract_file_name'] : ''; } @@ -322,4 +322,109 @@ class Contract extends Common return $this->sendError('删除失败'); } } + + // 合同检索 + public function searchContracts() + { + $param = request()->param(); + + $currPage = isset($param['currPage']) ? $param['currPage'] : 1; + $pageSize = isset($param['pageSize']) ? $param['pageSize'] : 20; + + // 构建查询条件 + $where = ['del_time' => null]; + + // 时间范围筛选 + if (isset($param['start_date']) && !empty($param['start_date'])) { + $where['create_time'] = ['>=', $param['start_date']]; + } + if (isset($param['end_date']) && !empty($param['end_date'])) { + if (isset($where['create_time'])) { + $where['create_time'] = [ + ['>=', $param['start_date']], + ['<=', $param['end_date']] + ]; + } else { + $where['create_time'] = ['<=', $param['end_date']]; + } + } + + // 合同分类筛选 + if (isset($param['contract_category']) && $param['contract_category'] !== '' && $param['contract_category'] !== '0') { + $where['contract_category'] = $param['contract_category']; + } + + // 查询合同列表 + $contractList = db('contract_info') + ->where($where) + ->order('contract_id', 'desc') + ->page($currPage, $pageSize) + ->select(); + + // 遍历合同列表，补充关联信息 + foreach ($contractList as &$contract) { + // 获取合同类型名称 + if ($contract['contract_type']) { + $contractType = db('contract_type') + ->where('type_id', $contract['contract_type']) + ->field('type_name') + ->find(); + $contract['contract_type_name'] = $contractType ? $contractType['type_name'] : ''; + } else { + $contract['contract_type_name'] = ''; + } + + // 获取合同分类名称 + switch ($contract['contract_category']) { + case 1: + $contract['contract_category_name'] = '销售合同'; + break; + case 2: + $contract['contract_category_name'] = '销售技术协议'; + break; + case 3: + $contract['contract_category_name'] = '采购合同'; + break; + case 4: + $contract['contract_category_name'] = '采购及技术协议'; + break; + case 5: + $contract['contract_category_name'] = '其他'; + break; + default: + $contract['contract_category_name'] = ''; + } + + // 获取项目名称 + if ($contract['project_id']) { + $project = db('project_info') + ->where('project_id', $contract['project_id']) + ->field('project_name') + ->find(); + $contract['project_name'] = $project ? $project['project_name'] : ''; + } else { + $contract['project_name'] = ''; + } + + // 获取合作伙伴名称 + if ($contract['partner_id']) { + $partner = db('partner_company') + ->where('company_id', $contract['partner_id']) + ->field('company_name') + ->find(); + $contract['partner_name'] = $partner ? $partner['company_name'] : ''; + } else { + $contract['partner_name'] = ''; + } + } + unset($contract); + + // 查询总记录数 + $total = db('contract_info')->where($where)->count(); + + $res['list'] = $contractList; + $res['total'] = $total; + + return $this->sendSuccess($res); + } } \ No newline at end of file diff --git a/front/README.md b/front/README.md index d0ff7d7..6baf907 100644 --- a/front/README.md +++ b/front/README.md @@ -1,4 +1,4 @@ -

+npm

diff --git a/front/index.html b/front/index.html index 8e15938..425cb6b 100644 --- a/front/index.html +++ b/front/index.html @@ -5,7 +5,7 @@ - Warehouse Management System + 上海诺力智能科技有限公司 diff --git a/front/src/api/contract.js b/front/src/api/contract.js index 48d4708..551d947 100644 --- a/front/src/api/contract.js +++ b/front/src/api/contract.js @@ -90,5 +90,14 @@ export default { method: 'post', data: param }) + }, + + // 合同检索 + searchContracts(param) { + return request({ + url: `/Contract/searchContracts`, + method: 'post', + data: param + }) } } diff --git a/front/src/api/hr.js b/front/src/api/hr.js index aec01aa..f9ff670 100644 --- a/front/src/api/hr.js +++ b/front/src/api/hr.js @@ -45,6 +45,13 @@ export default { data: param }) }, + getStaffPage(param) { + return request({ + url: `/Hr/GetStaffPage`, + method: "post", + data: param + }); + }, GetStaffTypeList() { return request({ url: `/Hr/GetStaffTypeList`, @@ -73,7 +80,7 @@ export default { data: param }) }, - + GetOperationDeptStaff() { return request({ diff --git a/front/src/views/components/ProjectBasicInfo.vue b/front/src/views/components/ProjectBasicInfo.vue index 89cee69..8021d48 100644 --- a/front/src/views/components/ProjectBasicInfo.vue +++ b/front/src/views/components/ProjectBasicInfo.vue @@ -5,39 +5,62 @@ 项目介绍：{{ - project_info.project_intro }} + project_info.project_intro }} - - {{ project_info.company_name }} - {{ project_info.project_name }} - {{ project_info.project_state_desp }} - 启动 + {{ project_info.company_name }} + {{ project_info.project_name }} + {{ project_info.project_state_desp }} + 启动 - {{ project_info.create_time }} - {{ project_info.sale_manager }} - 编辑 + {{ project_info.create_time }} + {{ project_info.sale_name }} + 编辑 - {{ project_info.project_manager }} - 编辑 + {{ project_info.project_manager }} + 编辑 - {{ project_info.project_members }} - 编辑 + {{ project_info.project_members }} + 编辑 - - 查看 + + 查看 - - 查看 + + 查看 - - 项目合同 - 设备资料 - 技术协议 - 会议纪要 - 投标文件 + + 项目合同 + 设备资料 + 技术协议 + 会议纪要 + 投标文件 - - 查看 + + 查看 - - 查看 + + 查看 @@ -77,92 +108,162 @@ - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- + Preview - + -
-

该文件类型（{{ fileExtension }}）需要下载后查看

- - 立即下载 {{ fileExtension.toUpperCase() }} 文件 - -
- +
+
+ + 增加合同类型 +
+
+ + 增加合同信息 +
+
+ + + + + + + + + 取 消 + 确 定 + + -
-
- - 增加合同类型 -
-
- - 增加合同信息 -
-
+ + + + + + + + + + + + + + + + + 销售合同 + 采购合同 + - - - - - - - - - 取 消 - 确 定 - - + + + + + + 点击上传 +
+ 支持jpg/jpeg/png/pdf/pptx/xlsx/xls/docx/doc/ppt/zip/rar文件，不超过100MB +
+ + + + + 取 消 + 确 定 + + - - - - - - - - - - - - - - - - - 销售合同 - 采购合同 - - - - - - - - - - 点击上传 -
- 支持jpg/jpeg/png/pdf/pptx/xlsx/xls/docx/doc/ppt/zip/rar文件，不超过100MB -
- - - - - 取 消 - 确 定 - - - - - - - - - - - - - - - - - - - - 销售合同 - 采购合同 - - - - - - - - 点击上传 -
- 支持jpg/jpeg/png/pdf/pptx/xlsx/xls/docx/doc/ppt/zip/rar文件，不超过100MB -
- - - - - 取 消 - 确 定 - - - + + + + + + + + + + + + + + + + + 销售合同 + 采购合同 + + + + + + + 点击上传 +
+ 支持jpg/jpeg/png/pdf/pptx/xlsx/xls/docx/doc/ppt/zip/rar文件，不超过100MB +
+ + + + + 取 消 + 确 定 + + + diff --git a/front/src/views/customer-mgr/customerlist.vue b/front/src/views/customer-mgr/customerlist.vue index f617202..af35cc9 100644 --- a/front/src/views/customer-mgr/customerlist.vue +++ b/front/src/views/customer-mgr/customerlist.vue @@ -62,7 +62,9 @@ export default { data() { let id = 1; return { - supplier_type_list: [], + newPartner: {}, + dialogVisibleAddPartner: false, + supplier_type_list: [], update_view:false, defaultProps: { children: 'sub_type', @@ -88,6 +90,31 @@ export default { }, methods: { + confirmAddPartner() { + // this.newPartner.company_type = this.partner_type + //如果是供应商,需要设置供应商的服务类型 + if (this.partner_type == 4) { + this.newPartner.service_type = this.service_type + } + else { + this.newPartner.service_type = 0; + } + + partner.AddPartnerCompanyInfo(this.newPartner).then(response => { + this.$message({ + type: 'success', + message: '添加成功' + }); + //this.get_supplier_type_list(supplier_type) + }).catch(error => { + this.$message({ + type: 'error', + message: '添加失败，请重试' + }); + }); + // 关闭所有对话框 + this.dialogVisibleAddPartner = false; + }, openTreeMenu(event, data, node, target) { console.log(event, data, node, target) @@ -129,7 +156,14 @@ export default { that.update_view = false; }, 100); // 1000 毫秒后执行 }, - + addPartnerInfo() { + this.dialogVisibleAddPartner = true; + this.newPartner = { + company_name: '', + company_intro: '', + create_time: '' + } + }, handle_node_click(data, node) { this.currentNode = node; this.currentData = data; diff --git a/front/src/views/hr-mgr/stafflist.vue b/front/src/views/hr-mgr/stafflist.vue index bfb7e0a..69f7567 100644 --- a/front/src/views/hr-mgr/stafflist.vue +++ b/front/src/views/hr-mgr/stafflist.vue @@ -1,97 +1,118 @@