bug修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmCompanyShareholderController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmCompanyShareholder;
 import com.ruoyi.system.service.project.IBmCompanyShareholderService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmCompanyShareholderController extends BaseController
     @PreAuthorize("@ss.hasPermi('shareholder:shareholder:add')")
     @Log(title = "注册企业股东构成", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmCompanyShareholder bmCompanyShareholder)
     {
         return toAjax(bmCompanyShareholderService.insertBmCompanyShareholder(bmCompanyShareholder));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmConstructionEqController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.project.BmConstructionEq;
 import com.ruoyi.system.service.project.IBmConstructionEqService;
@@ -80,6 +81,7 @@ public class BmConstructionEqController extends BaseController
     @PreAuthorize("@ss.hasPermi('constructionEq:constructionEq:add')")
     @Log(title = "项目设备安装 (最少一条记录)", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmConstructionEq bmConstructionEq)
     {
         return toAjax(bmConstructionEqService.insertBmConstructionEq(bmConstructionEq));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmConstructionPayController.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmConstructionPay;
 import com.ruoyi.system.service.project.IBmConstructionPayService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -71,6 +72,7 @@ public class BmConstructionPayController extends BaseController
     @PreAuthorize("@ss.hasPermi('constructionPay:pay:add')")
     @Log(title = "新增", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmConstructionPay bmConstructionPay)
     {
         return toAjax(bmConstructionPayService.insertBmConstructionPay(bmConstructionPay));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmConstructionPayInfoController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmConstructionPayInfo;
 import com.ruoyi.system.service.project.IBmConstructionPayInfoService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmConstructionPayInfoController extends BaseController
     @PreAuthorize("@ss.hasPermi('constructionPayInfo:payInfo:add')")
     @Log(title = "项目入统", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmConstructionPayInfo bmConstructionPayInfo)
     {
         return bmConstructionPayInfoService.insertBmConstructionPayInfo(bmConstructionPayInfo);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmConstructionRateController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmConstructionRate;
 import com.ruoyi.system.service.project.IBmConstructionRateService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmConstructionRateController extends BaseController
     @PreAuthorize("@ss.hasPermi('constructionRate:rate:add')")
     @Log(title = "项目施工进度", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmConstructionRate bmConstructionRate)
     {
         return toAjax(bmConstructionRateService.insertBmConstructionRate(bmConstructionRate));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmDeptPlanController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.project;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmDeptPlan;
 import com.ruoyi.system.domain.vo.BmDeptPlanVo;
 import com.ruoyi.system.service.project.IBmDeptPlanService;
@@ -73,6 +74,7 @@ public class BmDeptPlanController extends BaseController {
     @PreAuthorize("@ss.hasPermi('deptPlan:Plan:add')")
     @Log(title = " 部门招商计划", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmDeptPlan bmDeptPlan) {
         return toAjax(bmDeptPlanService.insertBmDeptPlan(bmDeptPlan));
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectConstructionController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmProjectConstruction;
 import com.ruoyi.system.service.project.IBmProjectConstructionService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmProjectConstructionController extends BaseController
     @PreAuthorize("@ss.hasPermi('projectConstruction:construction:add')")
     @Log(title = "项目施工", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProjectConstruction bmProjectConstruction)
     {
         return bmProjectConstructionService.insertBmProjectConstruction(bmProjectConstruction);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.project;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.project.BmProject;
 import com.ruoyi.system.domain.project.BmProjectStatus;
@@ -74,6 +75,7 @@ public class BmProjectController extends BaseController {
     @PreAuthorize("@ss.hasPermi('bmProject:project:add')")
     @Log(title = "项目(添加线索)", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProject bmProject) {
         return bmProjectService.insertBmProject(bmProject);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectInfoController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmProjectInfo;
 import com.ruoyi.system.service.project.IBmProjectInfoService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmProjectInfoController extends BaseController
     @PreAuthorize("@ss.hasPermi('projectInfo:info:add')")
     @Log(title = "项目-线索信息", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProjectInfo bmProjectInfo)
     {
         return toAjax(bmProjectInfoService.insertBmProjectInfo(bmProjectInfo));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectInvestorController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.project.BmProjectInvestor;
 import com.ruoyi.system.service.project.IBmProjectInvestorService;
@@ -75,6 +76,7 @@ public class BmProjectInvestorController extends BaseController
     @PreAuthorize("@ss.hasPermi('projectInvestor:investor:add')")
     @Log(title = "项目投资方-企业", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProjectInvestor bmProjectInvestor)
     {
         return toAjax(bmProjectInvestorService.insertBmProjectInvestor(bmProjectInvestor));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectOrderinfoController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmProjectOrderinfo;
 import com.ruoyi.system.service.project.IBmProjectOrderinfoService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmProjectOrderinfoController extends BaseController
     @PreAuthorize("@ss.hasPermi('projectOrderInfo:orderinfo:add')")
     @Log(title = "项目签约", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProjectOrderinfo bmProjectOrderinfo)
     {
         return bmProjectOrderinfoService.insertBmProjectOrderinfo(bmProjectOrderinfo);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectPersionController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.project;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.project.BmProjectPersion;
 import com.ruoyi.system.service.project.IBmProjectPersionService;
@@ -76,6 +77,7 @@ public class BmProjectPersionController extends BaseController
     @PreAuthorize("@ss.hasPermi('projectPersion:persion:add')")
     @Log(title = "项目投资方-自然人", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProjectPersion bmProjectPersion)
     {
         return toAjax(bmProjectPersionService.insertBmProjectPersion(bmProjectPersion));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectProductController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmProjectProduct;
 import com.ruoyi.system.service.project.IBmProjectProductService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmProjectProductController extends BaseController
     @PreAuthorize("@ss.hasPermi('projectProduct:product:add')")
     @Log(title = "项目投产", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProjectProduct bmProjectProduct)
     {
         return toAjax(bmProjectProductService.insertBmProjectProduct(bmProjectProduct));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectReferralController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmProjectReferral;
 import com.ruoyi.system.service.project.IBmProjectReferralService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmProjectReferralController extends BaseController
     @PreAuthorize("@ss.hasPermi('projectReferral:referral:add')")
     @Log(title = "项目引荐", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProjectReferral bmProjectReferral)
     {
         return toAjax(bmProjectReferralService.insertBmProjectReferral(bmProjectReferral));

ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmDeptPlan.java

@@ -23,6 +23,11 @@ public class BmDeptPlan extends BaseEntity
     @Excel(name = "年度")
     private String year;
 
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
     /** 计划 */
     @Excel(name = "计划")
     private Long plan;
@@ -43,7 +48,15 @@ public class BmDeptPlan extends BaseEntity
     @Excel(name = "目标投产项目数")
     private Long targetInvestmentNum;
 
-    public void setId(Long id) 
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmProjectInfoServiceImpl.java

@@ -36,7 +36,8 @@ public class BmProjectInfoServiceImpl implements IBmProjectInfoService
     @Override
     public BmProjectInfo selectBmProjectInfoById(Long id)
     {
-        return bmProjectInfoMapper.selectBmProjectInfoById(id);
+        BmProjectInfo bmProjectInfo = bmProjectInfoMapper.selectBmProjectInfoById(id);
+        return bmProjectInfo;
     }
 
     /**

ruoyi-system/src/main/resources/mapper/system/project/BmDeptPlanMapper.xml

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="targetContractAmount"    column="target_contract_amount"    />
         <result property="targetArrivalAmount"    column="target_arrival_amount"    />
         <result property="targetInvestmentNum"    column="target_investment_num"    />
+        <result property="deptName"    column="dept_name"    />
     </resultMap>
 
     <sql id="selectBmDeptPlanVo">
@@ -25,9 +26,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectBmDeptPlanList" parameterType="BmDeptPlan" resultMap="BmDeptPlanResult">
-        <include refid="selectBmDeptPlanVo"/>
+        select p.id, p.sys_dept_id, p.create_by, p.create_time, p.update_by, p.update_time, p.is_del, p.year, p.plan, p.target_signing_num, p.target_contract_amount, p.target_arrival_amount, p.target_investment_num, d.dept_name
+        from bm_dept_plan p
+        left join sys_dept d on p.sys_dept_id = d.dept_id and p.is_del = '0'
         <where>
-            is_del = '0'
             <if test="sysDeptId != null "> and sys_dept_id = #{sysDeptId}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="year != null  and year != ''"> and year = #{year}</if>
@@ -45,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertBmDeptPlan" parameterType="BmDeptPlan" useGeneratedKeys="true" keyProperty="id">
-        insert into bm_dept_Plan
+        insert into bm_dept_plan
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="sysDeptId != null">sys_dept_id,</if>
             <if test="createBy != null">create_by,</if>
@@ -77,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateBmDeptPlan" parameterType="BmDeptPlan">
-        update bm_dept_Plan
+        update bm_dept_plan
         <trim prefix="SET" suffixOverrides=",">
             <if test="sysDeptId != null">sys_dept_id = #{sysDeptId},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -96,11 +98,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteBmDeptPlanById" parameterType="Long">
-        delete from bm_dept_Plan where id = #{id}
+        delete from bm_dept_plan where id = #{id}
     </delete>
 
     <delete id="deleteBmDeptPlanByIds" parameterType="String">
-        delete from bm_dept_Plan where id in 
+        delete from bm_dept_plan where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

ruoyi-system/src/main/resources/mapper/system/project/BmProjectInfoMapper.xml

@@ -33,6 +33,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isFrameorder"    column="is_frameorder"    />
         <result property="attachment"    column="attachment"    />
         <result property="description"    column="description"    />
+        <collection  property="referralList"  javaType="java.util.List"  resultMap="BmProjectReferralResult" />
+    </resultMap>
+
+    <resultMap type="BmProjectReferral" id="BmProjectReferralResult">
+        <result property="id"    column="r_id"    />
+        <result property="bmProjectId"    column="r_bm_project_id"    />
+        <result property="createBy"    column="r_create_by"    />
+        <result property="createTime"    column="r_create_time"    />
+        <result property="updateBy"    column="r_update_by"    />
+        <result property="updateTime"    column="r_update_time"    />
+        <result property="isDel"    column="r_is_del"    />
+        <result property="phone"    column="r_phone"    />
+        <result property="sysDeptId"    column="r_sys_dept_id"    />
+        <result property="investmentAllcocation"    column="r_investment_allcocation"    />
+        <result property="referral"    column="r_referral"    />
+        <result property="referralPhone"    column="r_referral_phone"    />
     </resultMap>
 
     <sql id="selectBmProjectInfoVo">
@@ -70,12 +86,56 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectBmProjectInfoById" parameterType="Long" resultMap="BmProjectInfoResult">
-        <include refid="selectBmProjectInfoVo"/>
-        where bm_project_id = #{id}
+    SELECT
+	i.id,
+	i.bm_project_id,
+	i.create_by,
+	i.create_time,
+	i.update_by,
+	i.update_time,
+	i.NAME,
+	i.is_del,
+	i.contactor,
+	i.phone,
+	i.need_amt,
+	i.fixed_assets,
+	i.product_name,
+	i.product_qty,
+	i.product_price,
+	i.product_tax,
+	i.product_emp,
+	i.planned_land,
+	i.independent_land,
+	i.circulation_lan,
+	i.need_room,
+	i.need_factory_room,
+	i.need_bus_room,
+	i.other,
+	i.address,
+	i.is_frameorder,
+	i.attachment,
+	i.description,
+	r.id as r_id,
+	r.bm_project_id as r_bm_project_id,
+	r.create_by as r_create_by,
+	r.create_time as r_create_time,
+	r.update_by as r_update_by,
+	r.update_time as r_update_time,
+	r.is_del as r_is_del,
+	r.phone as r_phone,
+	r.sys_dept_id as r_sys_dept_id,
+	r.investment_allcocation as r_investment_allcocation,
+	r.referral as r_referral,
+	r.referral_phone as r_referral_phone
+    FROM
+	bm_project_info i
+	LEFT JOIN bm_project_referral r ON i.bm_project_id = r.bm_project_id
+	AND i.is_del = '0'
+        where i.bm_project_id = #{id}
     </select>
         
     <insert id="insertBmProjectInfo" parameterType="BmProjectInfo" useGeneratedKeys="true" keyProperty="id">
-        insert into bm_project_info
+        insert ignore into bm_project_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="bmProjectId != null">bm_project_id,</if>
             <if test="createBy != null">create_by,</if>

ruoyi-system/src/main/resources/mapper/system/project/BmProjectOrderinfoMapper.xml

@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertBmProjectOrderinfo" parameterType="BmProjectOrderinfo" useGeneratedKeys="true" keyProperty="id">
-        insert into bm_project_orderinfo
+        insert ignore into bm_project_orderinfo
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="bmProjectId != null">bm_project_id,</if>
             <if test="createBy != null">create_by,</if>

ruoyi-ui/src/api/deptplan/plan.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询 部门招商计划列表
+export function listPlan(query) {
+  return request({
+    url: '/deptPlan/plan/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询 部门招商计划详细
+export function getPlan(id) {
+  return request({
+    url: '/deptPlan/plan/' + id,
+    method: 'get'
+  })
+}
+
+// 新增 部门招商计划
+export function addPlan(data) {
+  return request({
+    url: '/deptPlan/plan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改 部门招商计划
+export function updatePlan(data) {
+  return request({
+    url: '/deptPlan/plan',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除 部门招商计划
+export function delPlan(id) {
+  return request({
+    url: '/deptPlan/plan/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出 部门招商计划
+export function exportPlan(query) {
+  return request({
+    url: '/deptPlan/plan/export',
+    method: 'get',
+    params: query
+  })
+}

ruoyi-ui/src/views/deptplan/index.vue

@@ -0,0 +1,374 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="年份" prop="configName">
+        <el-date-picker
+          v-model="queryParams.year"
+          type="year"
+          value-format="yyyy"
+          placeholder="选择年"
+          size="small"
+          @keyup.enter.native="handleQuery"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="部门" prop="sysDeptId">
+       <el-select
+         v-model="queryParams.sysDeptId"
+         placeholder="系统内置"
+         clearable
+         size="small"
+       >
+         <el-option
+           v-for="dict in typeOptionstwo"
+           :key="dict.deptId"
+           :label="dict.deptName"
+           :value="dict.deptId"
+         />
+       </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['deptplan:plan:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['deptplan:plan:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['deptplan:plan:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['deptplan:plan:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="年度" align="center" prop="year" />
+      <el-table-column label="部门" align="center" prop="deptName" />
+      <el-table-column label="计划" align="center" prop="plan" />
+      <el-table-column label="目标签约数" align="center" prop="targetSigningNum" />
+      <el-table-column label="目标合同金额" align="center" prop="targetContractAmount" />
+      <el-table-column label="目标到资金额" align="center" prop="targetArrivalAmount" />
+      <el-table-column label="目标投产项目数" align="center" prop="targetInvestmentNum" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['deptplan:plan:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['deptplan:plan:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改 部门招商计划对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-form-item label="年度" prop="year">
+          <!-- <el-input v-model="form.year" placeholder="请输入年度" /> -->
+          <el-date-picker
+            v-model="form.year"
+            type="year"
+            value-format="yyyy"
+            placeholder="选择年"
+            style="width: 100%;"
+            @keyup.enter.native="handleQuery"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="部门" prop="sysDeptId">
+         <el-select
+           v-model="form.sysDeptId"
+           placeholder="系统内置"
+           clearable
+           size="small"
+           style="width: 100%;"
+         >
+           <el-option
+             v-for="dict in typeOptionstwo"
+             :key="dict.deptId"
+             :label="dict.deptName"
+             :value="dict.deptId"
+           />
+         </el-select>
+        </el-form-item>
+        <el-form-item label="计划" prop="plan">
+          <el-input v-model="form.plan" placeholder="请输入计划" />
+        </el-form-item>
+        <el-form-item label="目标签约数" prop="targetSigningNum">
+          <el-input v-model="form.targetSigningNum" placeholder="请输入目标签约数" />
+        </el-form-item>
+        <el-form-item label="目标合同金额" prop="targetContractAmount">
+          <el-input v-model="form.targetContractAmount" placeholder="请输入目标合同金额" />
+        </el-form-item>
+        <el-form-item label="目标到资金额" prop="targetArrivalAmount">
+          <el-input v-model="form.targetArrivalAmount" placeholder="请输入目标到资金额" />
+        </el-form-item>
+        <el-form-item label="目标投产项目数" prop="targetInvestmentNum">
+          <el-input v-model="form.targetInvestmentNum" placeholder="请输入目标投产项目数" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPlan, getPlan, delPlan, addPlan, updatePlan, exportPlan } from "@/api/deptplan/plan";
+import {listConfigfieu} from "@/api/system/config";
+export default {
+  name: "Plan",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      //  部门招商计划表格数据
+      planList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        sysDeptId: null,
+        isDel: null,
+        year: null,
+        plan: null,
+        targetSigningNum: null,
+        targetContractAmount: null,
+        targetArrivalAmount: null,
+        targetInvestmentNum: null,
+        typeOptionstwo:[]
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+         targetSigningNum:[
+                  { required: true, message: '请输入目标签约数', trigger: 'change' }
+                ],
+        targetContractAmount:[
+                  { required: true, message: '请输入目标合同金额', trigger: 'change' }
+                ],
+        targetArrivalAmount:[
+                  { required: true, message: '请输入目标到资金额', trigger: 'change' }
+                ],
+        targetInvestmentNum:[
+                  { required: true, message: '请输入目标投产项目数', trigger: 'change' }
+                ],
+        plan:[
+                  { required: true, message: '请输入计划', trigger: 'change' }
+                ],
+        sysDeptId: [
+                    { required: true, message: '请选择部门', trigger: 'change' }
+                  ],
+        year: [
+                    { type: 'date', required: true, message: '请选择年份', trigger: 'change' }
+                  ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getListthuy()
+  },
+  methods: {
+    /** 查询 部门招商计划列表 */
+    getList() {
+      this.loading = true;
+      debugger;
+      listPlan(this.queryParams).then(response => {
+        this.planList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    //部门列表
+    getListthuy() {
+      this.loading = true;
+      listConfigfieu().then((response) => {
+        console.log(response);
+        this.typeOptionstwo = response.data;
+        // this.fileList =  this.queryParams.attachment
+        // this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        sysDeptId: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        isDel: null,
+        year: null,
+        plan: null,
+        targetSigningNum: null,
+        targetContractAmount: null,
+        targetArrivalAmount: null,
+        targetInvestmentNum: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加 部门招商计划";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getPlan(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改 部门招商计划";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updatePlan(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPlan(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除 部门招商计划编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delPlan(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有 部门招商计划数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportPlan(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/management/info/index.vue

@@ -67,7 +67,7 @@
             @click="chei(scope.row)">查看/审核</el-button>
           <el-button size="mini" type="text" style="background: #3FBCEF;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
             @click="infoBtn(scope.row)">{{scope.row.projectStatus%2==1?'提交审核':'驳回'}}</el-button>
-          <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']">修改</el-button>
+          <!-- <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']">修改</el-button> -->
           <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" @click="handleDelete(scope.row)"
             v-hasPermi="['projectInfo:info:remove']">销号</el-button>
         </template>
@@ -467,7 +467,7 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const ids = row.id || this.ids;
-        this.$confirm('是否确认删除项目-线索信息编号为"' + ids + '"的数据项?', "警告", {
+        this.$confirm('是否确认删除项目-线索信息"' + ids + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

ruoyi-ui/src/views/management/nstruction/index.vue

@@ -76,6 +76,7 @@
           <el-form
             :model="queryParamstwr"
             ref="queryForm"
+            :rules="queryForm"
             :inline="true"
             v-show="showSearch"
             label-width="135px"
@@ -755,11 +756,11 @@ export default {
       },
       imagese: [],
       numhu: 0, //判断
-      // 表单校验
+      // 添加开工照片表单校验
       rules: {
-        // configName: [
-        //   { required: true, message: "参数名称不能为空", trigger: "blur" }
-        // ],
+        rateType: [
+          { required: true, message: '请选择进度', trigger: 'change' }
+        ]
         // configKey: [
         //   { required: true, message: "参数键名不能为空", trigger: "blur" }
         // ],
@@ -767,8 +768,30 @@ export default {
         //   { required: true, message: "参数键值不能为空", trigger: "blur" }
         // ]
       },
+      // 项目施工
+      queryForm:{
+        isConstruction: [
+          { required: true, message: "请选择	是否开工建设", trigger: "blur" }
+        ],
+        constructionStartdate: [
+          { type: 'date', required: true, message: '请选择开工时间', trigger: 'change' }
+        ],
+        constructionEnddate: [
+          { type: 'date', required: true, message: '请选择预计完工时间', trigger: 'change' }
+        ]
+      },
+      //项目入统
+      queryFormtwo:{
+       statisticsDate: [
+         { type: 'date', required: true, message: '请选择入统时间', trigger: 'change' }
+       ]
+      },
       rulestwo: {},
-      rulesther: {},
+      rulesther: {
+        payForMoney: [
+          { required: true, message: '请输入金额', trigger: 'change' }
+        ]
+      },
       //开工照片
       onstruction: [],
       permit: [],
@@ -1176,6 +1199,14 @@ export default {
       if (this.numhu == 0) {
         this.$refs["form"].validate((valid) => {
           if (valid) {
+            if(this.form.rateType == undefined){
+              this.msgSuccess("请选择进度");
+              return  false
+            }
+            if(this.form.photo == undefined){
+              this.msgSuccess("请上传照片");
+              return  false
+            }
             addConfigther(this.form).then((response) => {
               this.msgSuccess("新增成功");
               this.open = false;
@@ -1186,6 +1217,14 @@ export default {
       } else if (this.numhu == 1) {
         this.$refs["formtwo"].validate((valid) => {
           if (valid) {
+            if(this.formtwo.eqType == undefined){
+              this.msgSuccess("请选择进度");
+              return  false
+            }
+            if(this.formtwo.photo == undefined){
+              this.msgSuccess("请上传照片");
+              return  false
+            }
             addConfigfour(this.formtwo).then((response) => {
               this.msgSuccess("新增成功");
               this.opentwo = false;
@@ -1197,8 +1236,18 @@ export default {
         console.log("步骤3");
         this.$refs["formther"].validate((valid) => {
           if (valid) {
-            console.log("步骤5");
-            console.log("步骤4");
+            if(this.formther.payForType == undefined){
+              this.msgSuccess("请选择进度");
+              return  false
+            }
+            if(this.formther.payForMoney == undefined){
+              this.msgSuccess("请输入到资金额");
+              return  false
+            }
+            if(this.formther.photo == undefined){
+              this.msgSuccess("请上传照片");
+              return  false
+            }
             addConfigfiv(this.formther).then((response) => {
               this.msgSuccess("新增成功");
               this.openther = false;
@@ -1216,7 +1265,31 @@ export default {
       if (this.tab == 0) {
         this.$refs["queryForm"].validate((valid) => {
           if (valid) {
+            // if(this.queryParamstwr.constructionCode == ''){
+            //   this.msgSuccess("请上传施工许可证");
+            //   return  false
+            // }
             if (this.modify == 1) {
+              if(this.queryParamstwr.constructionCode == null){
+                this.msgSuccess("请上传施工许可证");
+                return  false
+              }
+              if(this.queryParamstwr.constructionDoc == null){
+                this.msgSuccess("请上传施工施工合同");
+                return  false
+              }
+              if(this.queryParamstwr.constructionPhoto == null){
+                this.msgSuccess("请上传开工合同");
+                return  false
+              }
+              if(this.queryParamstwr.constructionEnddate == null){
+                this.msgSuccess("请选择预计完工日期");
+                return  false
+              }
+              if(this.queryParamstwr.constructionStartdate == null){
+                this.msgSuccess("请选择开工日期");
+                return  false
+              }
               //修改
               updateConfigatruction(this.queryParamstwr).then((response) => {
                 this.msgSuccess("修改成功");
@@ -1225,6 +1298,26 @@ export default {
                 this.$router.go(-1);
               });
             } else if (this.modify == 0) {
+              if(this.queryParamstwr.constructionCode == undefined){
+                this.msgSuccess("请上传施工许可证");
+                return  false
+              }
+              if(this.queryParamstwr.constructionDoc == undefined){
+                this.msgSuccess("请上传施工施工合同");
+                return  false
+              }
+              if(this.queryParamstwr.constructionPhoto == undefined){
+                this.msgSuccess("请上传开工合同");
+                return  false
+              }
+              if(this.queryParamstwr.constructionEnddate == undefined){
+                this.msgSuccess("请选择预计完工日期");
+                return  false
+              }
+              if(this.queryParamstwr.constructionStartdate == undefined){
+                this.msgSuccess("请选择开工日期");
+                return  false
+              }
               //新增
               this.queryParamstwr.bmProjectId = this.bmProjectId;
               addConfigtherction(this.queryParamstwr).then((response) => {
@@ -1240,6 +1333,14 @@ export default {
         this.$refs["queryFormtwo"].validate((valid) => {
           if (valid) {
             if (this.udgment == 1) {
+              if(this.queryParamstheyr.statisticsDate == null){
+                this.msgSuccess("请选择入统日期");
+                return  false
+              }
+              if(this.queryParamstheyr.statisticsPhoto == null){
+                this.msgSuccess("请上传入统截图");
+                return  false
+              }
               //修改
               updateConfigntegration(this.queryParamstheyr).then((response) => {
                 this.msgSuccess("修改成功");
@@ -1248,6 +1349,14 @@ export default {
                 this.$router.go(-1);
               });
             } else {
+              if(this.queryParamstheyr.statisticsDate == undefined){
+                this.msgSuccess("请选择入统日期");
+                return  false
+              }
+              if(this.queryParamstheyr.statisticsPhoto == undefined){
+                this.msgSuccess("请上传入统截图");
+                return  false
+              }
               this.queryParamstheyr.bmProjectId = this.bmProjectId;
               addConfigsix(this.queryParamstheyr).then((response) => {
                 this.msgSuccess("新增成功");
@@ -1264,7 +1373,7 @@ export default {
     handleDelete(row) {
       const configIds = row.id;
       this.$confirm(
-        '是否确认删除参数编号为"' + configIds + '"的数据项?',
+        '是否确认删除"' + configIds + '"的数据项?',
         "警告",
         {
           confirmButtonText: "确定",
@@ -1284,7 +1393,7 @@ export default {
     handleDeletetwo(row) {
       const configIds = row.id;
       this.$confirm(
-        '是否确认删除参数编号为"' + configIds + '"的数据项?',
+        '是否确认删除"' + configIds + '"的数据项?',
         "警告",
         {
           confirmButtonText: "确定",
@@ -1304,7 +1413,7 @@ export default {
     handleDeletether(row) {
       const configIds = row.id;
       this.$confirm(
-        '是否确认删除参数编号为"' + configIds + '"的数据项?',
+        '是否确认删除"' + configIds + '"的数据项?',
         "警告",
         {
           confirmButtonText: "确定",

ruoyi-ui/src/views/under/index.vue

@@ -20,7 +20,7 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          @click="cancel"
+          @click="cancelqiu"
           v-hasPermi="['system:config:edit']"
           >取消</el-button
         >
@@ -170,9 +170,9 @@
           :key="index"
           v-if="queryParams.referralList !== null"
         >
-          <el-form-item label="引荐单位:" prop="sysdeptId">
+          <el-form-item label="引荐单位:" prop="sysDeptId">
             <el-select
-              v-model="item.sysdeptId"
+              v-model="item.sysDeptId"
               placeholder="系统内置"
               clearable
               size="small"
@@ -220,9 +220,9 @@
           </el-form-item>
         </div>
         <div v-if="queryParams.referralList == null">
-          <el-form-item label="引荐单位:" prop="sysdeptId">
+          <el-form-item label="引荐单位:" prop="sysDeptId">
             <el-select
-              v-model="queryParams.referralList[0].sysdeptId"
+              v-model="queryParams.referralList[0].sysDeptId"
               placeholder="系统内置"
               clearable
               size="small"
@@ -268,9 +268,9 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="引荐单位:" prop="sysdeptId">
+          <el-form-item label="引荐单位:" prop="sysDeptId">
             <el-select
-              v-model="queryParams.referralList[1].sysdeptId"
+              v-model="queryParams.referralList[1].sysDeptId"
               placeholder="系统内置"
               clearable
               size="small"
@@ -658,7 +658,7 @@
         </el-form-item> -->
         <el-form-item label="联系方式" prop="phone">
           <el-input
-            v-model.number="formtwo.phone"
+            v-model="formtwo.phone"
             type="phone"
             placeholder="请输入联系方式"
           />
@@ -746,14 +746,14 @@ export default {
         referralList: [
           {
             bmProjectId: "",
-            sysdeptId: "",
+            sysDeptId: "",
             investmentAllcocation: "",
             referral: "",
             referralPhone: "",
           },
           {
             bmProjectId: "",
-            sysdeptId: "",
+            sysDeptId: "",
             investmentAllcocation: "",
             referral: "",
             referralPhone: "",
@@ -804,10 +804,19 @@ export default {
         ],
         idcode: [
           { required: true, message: "身份证号码不能为空", trigger: "blur" },
+          {
+            pattern: /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)/,
+            message: "身份证号码格式不对",
+            trigger: "blur",
+          }
         ],
         phone: [
           { required: true, message: "联系方式不能为空", trigger: "blur" },
-          { type: "number", message: "联系方式必须为数字值" },
+          {
+            pattern: /^0{0,1}(13[0-9]|15[7-9]|153|156|18[7-9])[0-9]{8}$/,
+            message: "手机号格式不对",
+            trigger: "blur",
+          }
         ],
       },
 
@@ -967,14 +976,14 @@ export default {
             referralList: [
               {
                 bmProjectId: this.bmProjectId,
-                sysdeptId: "",
+                sysDeptId: "",
                 investmentAllcocation: "",
                 referral: "",
                 referralPhone: "",
               },
               {
                 bmProjectId: this.bmProjectId,
-                sysdeptId: "",
+                sysDeptId: "",
                 investmentAllcocation: "",
                 referral: "",
                 referralPhone: "",
@@ -990,14 +999,14 @@ export default {
             this.queryParams.referralList = [
               {
                 bmProjectId: this.bmProjectId,
-                sysdeptId: "",
+                sysDeptId: "",
                 investmentAllcocation: "",
                 referral: "",
                 referralPhone: "",
               },
               {
                 bmProjectId: this.bmProjectId,
-                sysdeptId: "",
+                sysDeptId: "",
                 investmentAllcocation: "",
                 referral: "",
                 referralPhone: "",
@@ -1285,6 +1294,10 @@ export default {
       this.$emit("changeTab", index);
       // this.tab = index
     },
+    // 取消按钮
+    cancelqiu(){
+      this.$router.go(-1);
+    }
   },
 };
 </script>