Skip to content

C
cfld-know-admin
Commit 7f743ff3 authored by yaobaizheng's avatar yaobaizheng
Browse files
Options

合伙招商后台

parent 6649d3cb
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 100 deletions
ruoyi-system/src/main/resources/mapper/partnerProject/PartnerProjectInfoMapper.xml
View file @ 7f743ff3
...@@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_user su on ppi.partner_id = su.user_id left join sys_user su on ppi.partner_id = su.user_id
left join company c on c.id = pi.cid left join company c on c.id = pi.cid
<where> <where>
ppi.status != 20 -- 作废 ppi.status not in (0, 20) -- 暂存 作废
<if test="investmentSubject != null and investmentSubject != ''"> <if test="investmentSubject != null and investmentSubject != ''">
and (ppi.investment_subject like concat('%',#{investmentSubject} ,'%') or c.ent_name like concat('%',#{investmentSubject},'%') ) and (ppi.investment_subject like concat('%',#{investmentSubject} ,'%') or c.ent_name like concat('%',#{investmentSubject},'%') )
</if> </if>
......
ruoyi-system/src/main/resources/templates/partnerProject/info/editProjectInfo.html
View file @ 7f743ff3
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
<div class="row sizeDiv" id="changeStatusDiv2"> <div class="row sizeDiv" id="changeStatusDiv2">
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">项目查重:</label> <label class="col-sm-3 control-label">项目查重</label>
<div class="col-sm-10"> <div class="col-sm-9">
<select class="form-control m-b" id="repeatType" name="repeatType"> <select class="form-control m-b" id="repeatType" name="repeatType">
<option value="0">未重复</option> <option value="0">未重复</option>
<option value="1">重复</option> <option value="1">重复</option>
...@@ -123,8 +123,8 @@ ...@@ -123,8 +123,8 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">项目查询</label> <label class="col-sm-3 control-label">项目查询</label>
<div class="col-sm-10"> <div class="col-sm-9">
<div class="input-group"> <div class="input-group">
<input class="form-control" type="text" id="chanyezhidaoPeojectId1" name="chanyezhidaoPeojectId1" onclick="selectProjectInfo()" readonly="readonly"> <input class="form-control" type="text" id="chanyezhidaoPeojectId1" name="chanyezhidaoPeojectId1" onclick="selectProjectInfo()" readonly="readonly">
<span class="input-group-addon"><i class="fa fa-search"></i></span> <span class="input-group-addon"><i class="fa fa-search"></i></span>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
</div> </div>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<label class="col-sm-2 control-label">阶段反馈：</label> <label class="col-sm-2 control-label">阶段反馈</label>
<div class="col-sm-10"> <div class="col-sm-10">
<textarea name="feedback2" id="feedback2" rows="4" class="form-control"></textarea> <textarea name="feedback2" id="feedback2" rows="4" class="form-control"></textarea>
</div> </div>
...@@ -145,8 +145,8 @@ ...@@ -145,8 +145,8 @@
<div class="row sizeDiv" id="changeStatusDiv4"> <div class="row sizeDiv" id="changeStatusDiv4">
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">关联项目：</label> <label class="col-sm-3 control-label">关联项目</label>
<div class="col-sm-10"> <div class="col-sm-9">
<div class="input-group"> <div class="input-group">
<input class="form-control" type="text" id="chanyezhidaoPeojectId" name="chanyezhidaoPeojectId" onclick="selectProjectInfo()" readonly="readonly"> <input class="form-control" type="text" id="chanyezhidaoPeojectId" name="chanyezhidaoPeojectId" onclick="selectProjectInfo()" readonly="readonly">
<span class="input-group-addon"><i class="fa fa-search"></i></span> <span class="input-group-addon"><i class="fa fa-search"></i></span>
...@@ -167,8 +167,8 @@ ...@@ -167,8 +167,8 @@
<div class="row sizeDiv" id="changeStatusDiv5"> <div class="row sizeDiv" id="changeStatusDiv5">
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">对接结果:</label> <label class="col-sm-3 control-label">对接结果</label>
<div class="col-sm-10"> <div class="col-sm-9">
<select class="form-control m-b" id="duijiejieguo" name="duijiejieguo"> <select class="form-control m-b" id="duijiejieguo" name="duijiejieguo">
<option value="0">未对接</option> <option value="0">未对接</option>
<option value="1">已对接</option> <option value="1">已对接</option>
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
</div> </div>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<label class="col-sm-4 control-label">阶段反馈：</label> <label class="col-sm-4 control-label">阶段反馈</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="feedback5" id="feedback5" rows="4" class="form-control"></textarea> <textarea name="feedback5" id="feedback5" rows="4" class="form-control"></textarea>
</div> </div>
...@@ -189,8 +189,8 @@ ...@@ -189,8 +189,8 @@
<div class="row sizeDiv" id="changeStatusDiv6"> <div class="row sizeDiv" id="changeStatusDiv6">
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">确认投资意向:</label> <label class="col-sm-3 control-label">确认投资意向</label>
<div class="col-sm-10"> <div class="col-sm-9">
<select class="form-control m-b" id="touziyixiang" name="touziyixiang"> <select class="form-control m-b" id="touziyixiang" name="touziyixiang">
<option value="0">无意向</option> <option value="0">无意向</option>
<option value="1">有意向</option> <option value="1">有意向</option>
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
</div> </div>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<label class="col-sm-4 control-label">阶段反馈：</label> <label class="col-sm-4 control-label">阶段反馈</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="feedback6" id="feedback6" rows="4" class="form-control"></textarea> <textarea name="feedback6" id="feedback6" rows="4" class="form-control"></textarea>
</div> </div>
...@@ -211,8 +211,8 @@ ...@@ -211,8 +211,8 @@
<div class="row sizeDiv" id="changeStatusDiv7"> <div class="row sizeDiv" id="changeStatusDiv7">
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">项目信息:</label> <label class="col-sm-3 control-label">项目信息</label>
<div class="col-sm-10"> <div class="col-sm-9">
<select class="form-control m-b" id="xmxxqr" name="xmxxqr"> <select class="form-control m-b" id="xmxxqr" name="xmxxqr">
<option value="0">未确认</option> <option value="0">未确认</option>
<option value="1">已确认</option> <option value="1">已确认</option>
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
</div> </div>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<label class="col-sm-4 control-label">阶段反馈：</label> <label class="col-sm-4 control-label">阶段反馈</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="feedback7" id="feedback7" rows="4" class="form-control"></textarea> <textarea name="feedback7" id="feedback7" rows="4" class="form-control"></textarea>
</div> </div>
...@@ -250,12 +250,12 @@ ...@@ -250,12 +250,12 @@
<div class="ibox-content"> <div class="ibox-content">
<form class="form-horizontal m" id="form-info-edit" th:object="${partnerProjectInfo}"> <form class="form-horizontal m" id="form-info-edit" th:object="${partnerProjectInfo}">
<input name="id" th:field="*{id}" type="hidden"> <input name="id" th:field="*{id}" type="hidden">
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">近年营收：</label> <!-- <label class="col-sm-3 control-label">近年营收：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="continuousRevenue" th:field="*{continuousRevenue}" class="form-control" type="text"> <!-- <input name="continuousRevenue" th:field="*{continuousRevenue}" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">投资主体：</label> <label class="col-sm-3 control-label">投资主体：</label>
<div class="col-sm-8"> <div class="col-sm-8">
...@@ -268,12 +268,12 @@ ...@@ -268,12 +268,12 @@
<input name="enterpriseHighlights" th:field="*{enterpriseHighlights}" class="form-control" type="text"> <input name="enterpriseHighlights" th:field="*{enterpriseHighlights}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">产业基地：</label> <!-- <label class="col-sm-3 control-label">产业基地：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="industrialBase" th:field="*{industrialBase}" class="form-control" type="text"> <!-- <input name="industrialBase" th:field="*{industrialBase}" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">建设内容建设内容：</label> <label class="col-sm-3 control-label">建设内容建设内容：</label>
<div class="col-sm-8"> <div class="col-sm-8">
...@@ -312,12 +312,12 @@ ...@@ -312,12 +312,12 @@
<input name="intendedRegion" th:field="*{intendedRegion}" class="form-control" type="text"> <input name="intendedRegion" th:field="*{intendedRegion}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">佣金比例：</label> <!-- <label class="col-sm-3 control-label">佣金比例：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="regionCommissionRate" th:field="*{regionCommissionRate}" class="form-control" type="text"> <!-- <input name="regionCommissionRate" th:field="*{regionCommissionRate}" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">土地需求：</label> <label class="col-sm-3 control-label">土地需求：</label>
<div class="col-sm-8"> <div class="col-sm-8">
...@@ -342,60 +342,60 @@ ...@@ -342,60 +342,60 @@
<input name="decisionMakerPosition" th:field="*{decisionMakerPosition}" class="form-control" type="text"> <input name="decisionMakerPosition" th:field="*{decisionMakerPosition}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">项目状态</label> <!-- <label class="col-sm-3 control-label">项目状态</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="statusDescription" th:field="*{status}" class="form-control" type="text"> <!-- <input name="statusDescription" th:field="*{status}" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">项目状态</label> <!-- <label class="col-sm-3 control-label">项目状态</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="statusDescription" th:field="*{statusDescription}" class="form-control" type="text"> <!-- <input name="statusDescription" th:field="*{statusDescription}" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">项目归属人：</label> <!-- <label class="col-sm-3 control-label">项目归属人：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="partnerId" th:field="*{partnerId}" class="form-control" type="text"> <!-- <input name="partnerId" th:field="*{partnerId}" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">归属人是否已确认：</label> <!-- <label class="col-sm-3 control-label">归属人是否已确认：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="partnerHasConfirm" th:field="*{partnerHasConfirm}" class="form-control" type="text"> <!-- <input name="partnerHasConfirm" th:field="*{partnerHasConfirm}" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">匹配招商公司：</label> <!-- <label class="col-sm-3 control-label">匹配招商公司：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="investmentPromotionCompany" th:field="*{investmentPromotionCompany}" class="form-control" type="text"> <!-- <input name="investmentPromotionCompany" th:field="*{investmentPromotionCompany}" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">租户id：</label> <!-- <label class="col-sm-3 control-label">租户id：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="tenantId" th:field="*{tenantId}" class="form-control" type="text"> <!-- <input name="tenantId" th:field="*{tenantId}" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">秘书id：</label> <!-- <label class="col-sm-3 control-label">秘书id：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="secretaryId" th:field="*{secretaryId}" class="form-control" type="text"> <!-- <input name="secretaryId" th:field="*{secretaryId}" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">产业知道项目id：</label> <!-- <label class="col-sm-3 control-label">产业知道项目id：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="projectId" th:field="*{projectId}" class="form-control" type="text"> <!-- <input name="projectId" th:field="*{projectId}" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">0-项目查重确认 1-确认项目所属 2-确认佣金比例：</label> <!-- <label class="col-sm-3 control-label">0-项目查重确认 1-确认项目所属 2-确认佣金比例：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="todoStatusDescription" th:field="*{todoStatusDescription}" class="form-control" type="text"> <!-- <input name="todoStatusDescription" th:field="*{todoStatusDescription}" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</form> </form>
</div> </div>
</div> </div>
...@@ -420,6 +420,7 @@ ...@@ -420,6 +420,7 @@
$(element).next("button").addClass("btn btn-lg btn-info btn-arrow-right"); $(element).next("button").addClass("btn btn-lg btn-info btn-arrow-right");
} }
} }
changeStatus2();
}); });
function changeStatus1() { function changeStatus1() {
......
ruoyi-system/src/main/resources/templates/partnerProject/info/info.html
View file @ 7f743ff3
...@@ -34,18 +34,18 @@ ...@@ -34,18 +34,18 @@
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="partnerProject:info:add"> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="partnerProject:info:add">-->
<i class="fa fa-plus"></i> 添加 <!-- <i class="fa fa-plus"></i> 添加-->
</a> <!-- </a>-->
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="partnerProject:info:edit"> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="partnerProject:info:edit">-->
<i class="fa fa-edit"></i> 修改 <!-- <i class="fa fa-edit"></i> 编辑-->
</a> <!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="partnerProject:info:remove">--> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="partnerProject:info:remove">-->
<!-- <i class="fa fa-remove"></i> 删除--> <!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="partnerProject:info:export"> <!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="partnerProject:info:export">-->
<i class="fa fa-download"></i> 导出 <!-- <i class="fa fa-download"></i> 导出-->
</a> <!-- </a>-->
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.id + '\')"><i class="fa fa-edit"></i>审核中</a> ');
// actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>'); // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); return actions.join('');
} }
......
ruoyi-system/src/main/resources/templates/project/info/selectProjectInfo.html
View file @ 7f743ff3
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "产业知道项目信息", modalName: "产业知道项目信息",
columns: [{ columns: [{
checkbox: true checkbox: false
}, },
{ {
field: 'id', field: 'id',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment