模板更新，

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -3587,4 +3587,32 @@ public class ActTaskService extends BaseService {
         Map<String, Object> vars = Maps.newHashMap();
         complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
     }
+
+    /**
+     * 交底:是否借款
+     */
+    @Transactional(readOnly = false)
+    public void wbsTask(Act act) {
+        // 设置意见
+        act.setComment(("yes".equals(act.getFlag()) ? "[同意] " : "[驳回] ") + act.getComment());
+        act.preUpdate();
+        // 提交流程任务
+        Map<String, Object> vars = Maps.newHashMap();
+        Project user = MyActiviUtils.findFundUser(act.getProcInsId());
+        vars.put("manager", UserUtils.getByUserName(user.getAssignment().getInspectionUnit()).getLoginName());
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+    }
+
+    /**
+     * 交底:是否借款
+     */
+    @Transactional(readOnly = false)
+    public void assetTask(Act act) {
+        // 设置意见
+        act.setComment(("yes".equals(act.getFlag()) ? "[同意] " : "[驳回] ") + act.getComment());
+        act.preUpdate();
+        // 提交流程任务
+        Map<String, Object> vars = Maps.newHashMap();
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+    }
 }

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -44,6 +44,8 @@ import com.jeeplus.modules.sg.materialmodule.activiti.service.NonPowerService;
 import com.jeeplus.modules.sg.picking.activiti.entity.PickApplication;
 import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
 import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
+import com.jeeplus.modules.sg.settActivi.entity.SettActivi;
+import com.jeeplus.modules.sg.settActivi.entity.SettList;
 import com.jeeplus.modules.sg.settActivi.service.SettActiviService;
 import com.jeeplus.modules.sys.service.SystemService;
 import org.activiti.engine.HistoryService;
@@ -1648,6 +1650,13 @@ public class ActTaskController extends BaseController {
     @RequestMapping(value = "useQuantityTask")
     public AjaxJson useQuantityTask(Act act) {
         AjaxJson j = new AjaxJson();
+        SettList settList = new SettList();
+        settList.setAct(act);
+        List<SettList> useQuantityData = settActiviService.findUseQuantityData(settList);
+        if (null == useQuantityData || useQuantityData.size() <= 0) {
+            j.setMsg("请先导入明细账");
+            return j;
+        }
         actTaskService.useQuantity(act);
         j.setMsg("审批成功");
         return j;
@@ -2071,9 +2080,9 @@ public class ActTaskController extends BaseController {
                     Project user = MyActiviUtils.findTJUser(act.getProcInsId());
                     OaNotify oaNotify = new OaNotify();
                     oaNotify.setType("4");
-                    oaNotify.setTitle(nonPower.getReserveProjectName()+"：土建需要验收");
+                    oaNotify.setTitle(nonPower1.getReserveProjectName()+"：土建需要验收");
                     oaNotify.setStatus("1");
-                    oaNotify.setContent(nonPower.getReserveProjectName() + "：土建需要验收");
+                    oaNotify.setContent(nonPower1.getReserveProjectName() + "：土建需要验收");
                     oaNotify.setOaNotifyRecordIds(UserUtils.getByUserName(user.getAssignment().getRepUnit()).getId());
                     oaNotifyService.save(oaNotify);
                     List<OaNotifyRecord> list = oaNotify.getOaNotifyRecordList();
@@ -2277,4 +2286,6 @@ public class ActTaskController extends BaseController {
         j.setMsg("审批成功");
         return j;
     }
+
+
 }

src/main/java/com/jeeplus/modules/sg/fund/entity/Fund.java

@@ -0,0 +1,67 @@
+package com.jeeplus.modules.sg.fund.entity;
+
+import com.jeeplus.core.persistence.ActEntity;
+import com.jeeplus.modules.sg.managementcenter.project.entity.BasicInformation;
+
+public class Fund extends ActEntity<Fund> {
+    //工程编号
+    private String projectId;
+    //项目定义描述
+    private String projectName;
+    //储备项目名称
+    private String reserveProjectName;
+    //wbs编码
+    private String wbsEncoding;
+    //资产卡片号
+    private String assetCardNumber;
+    //项目基础信息
+    private BasicInformation basicInformation;
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getReserveProjectName() {
+        return reserveProjectName;
+    }
+
+    public void setReserveProjectName(String reserveProjectName) {
+        this.reserveProjectName = reserveProjectName;
+    }
+
+    public String getWbsEncoding() {
+        return wbsEncoding;
+    }
+
+    public void setWbsEncoding(String wbsEncoding) {
+        this.wbsEncoding = wbsEncoding;
+    }
+
+    public String getAssetCardNumber() {
+        return assetCardNumber;
+    }
+
+    public void setAssetCardNumber(String assetCardNumber) {
+        this.assetCardNumber = assetCardNumber;
+    }
+
+    public BasicInformation getBasicInformation() {
+        return basicInformation;
+    }
+
+    public void setBasicInformation(BasicInformation basicInformation) {
+        this.basicInformation = basicInformation;
+    }
+}

src/main/java/com/jeeplus/modules/sg/fund/mapper/FundMapper.java

@@ -0,0 +1,15 @@
+package com.jeeplus.modules.sg.fund.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.fund.entity.Fund;
+import org.apache.ibatis.annotations.Param;
+
+@MyBatisMapper
+public interface FundMapper extends BaseMapper<Fund> {
+    //修改项目wbs
+    void updateWbs(@Param("wbsEncoding") String wbsEncoding, @Param("procInsId")String procInsId);
+
+    //修改项目资产卡片号
+    void updateAsset(@Param("assetCardNumber") String assetCardNumber, @Param("procInsId")String procInsId);
+}

src/main/java/com/jeeplus/modules/sg/fund/mapper/xml/FundMapper.xml

@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.sg.fund.mapper.FundMapper">
+
+    <sql id="FundColumns">
+        a.id,
+        a.create_by,
+        a.create_date,
+        a.update_by,
+        a.update_date,
+        a.del_flag,
+        a.remarks,
+        a.projectId,
+        a.projectName,
+        a.proc_ins_id,
+        a.reserveProjectName,
+        a.wbsEncoding,
+        a.assetCardNumber
+    </sql>
+
+    <sql id="basicColumns">
+        b.id as `basicInformation.id`,
+        b.reserveProjectName as `basicInformation.reserveProjectName`,
+		b.municipalCompany AS `basicInformation.municipalCompany`,
+		b.countyCompany AS `basicInformation.countyCompany`,
+		b.projectNature AS `basicInformation.projectNature`,
+		b.demandUnit AS `basicInformation.demandUnit`,
+		b.operationUnit AS `basicInformation.operationUnit`,
+		b.powerSupplyArea AS `basicInformation.powerSupplyArea`,
+		b.gridNumber AS `basicInformation.gridNumber`,
+		b.cellNumber AS `basicInformation.cellNumber`,
+		b.projectReserveNo AS `basicInformation.projectReserveNo`,
+		b.gridProjectNo AS `basicInformation.gridProjectNo`,
+		b.erpNo AS `basicInformation.erpNo`,
+		b.necessityContent AS `basicInformation.necessityContent`,
+		b.subStationName AS `basicInformation.subStationName`,
+		b.lineName AS `basicInformation.lineName`,
+		b.projectType AS `basicInformation.projectType`,
+		b.whetherSummer AS `basicInformation.whetherSummer`,
+		b.basicDescription AS `basicInformation.basicDescription`,
+		b.workAreaRemarks AS `basicInformation.workAreaRemarks`
+    </sql>
+
+    <select id="get" resultType="Fund">
+        SELECT
+        <include refid="FundColumns"/>,
+        <include refid="basicColumns"/>
+        from xm_fund_process a
+        LEFT JOIN xm_project_basicinformation b
+        on a.reserveProjectName = b.reserveProjectName
+        WHERE a.id = #{id}
+    </select>
+
+    <select id="findList" resultType="Fund">
+        SELECT
+        <include refid="FundColumns"/>
+        from xm_fund_process a
+        <where>
+            del_flag = #{DEL_FLAG_NORMAL}
+            ${dataScope}
+            <if test="projectId != null and projectId !=''">
+                and a.projectId = #{projectId}
+            </if>
+            <if test="projectName != null and projectName !=''">
+                and a.projectName = #{projectName}
+            </if>
+            <if test="reserveProjectName != null and reserveProjectName !=''">
+                and a.reserveProjectName = #{reserveProjectName}
+            </if>
+        </where>
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+            <otherwise>
+                ORDER BY a.update_date DESC
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="findAllList" resultType="Fund">
+        SELECT
+        <include refid="FundColumns"/>
+        from xm_fund_process a
+        <where>
+            del_flag = #{DEL_FLAG_NORMAL}
+            ${dataScope}
+        </where>
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+            <otherwise>
+                ORDER BY a.update_date DESC
+            </otherwise>
+        </choose>
+    </select>
+
+    <insert id="insert">
+        INSERT INTO xm_fund_process
+        (id,
+         create_by,
+         create_date,
+         update_by,
+         update_date,
+         del_flag,
+         remarks,
+         projectId,
+         projectName,
+         proc_ins_id,
+         reserveProjectName,
+         wbsEncoding,
+         assetCardNumber)
+        VALUES (#{id},
+                #{createBy.id},
+                #{createDate},
+                #{updateBy.id},
+                #{updateDate},
+                #{delFlag},
+                #{remarks},
+                #{projectId},
+                #{projectName},
+                #{procInsId},
+                #{reserveProjectName},
+                #{wbsEncoding},
+                #{assetCardNumber});
+    </insert>
+
+    <update id="update">
+        UPDATE xm_fund_process
+        SET proc_ins_id = #{procInsId},
+            update_by   = #{updateBy.id},
+            update_date = #{updateDate}
+        WHERE proc_ins_id = #{procInsIdid}
+    </update>
+
+    <update id="updateWbs">
+        UPDATE xm_fund_process
+        SET wbsEncoding = #{wbsEncoding}
+        WHERE proc_ins_id = #{procInsId}
+    </update>
+
+
+    <update id="updateAsset">
+        UPDATE xm_fund_process
+        SET assetCardNumber = #{assetCardNumber}
+        WHERE proc_ins_id = #{procInsId}
+    </update>
+
+    <!--物理删除-->
+    <update id="delete">
+        DELETE
+        FROM xm_fund_process
+        WHERE id = #{id}
+    </update>
+
+    <!--逻辑删除-->
+    <update id="deleteByLogic">
+        UPDATE xm_fund_process
+        SET del_flag = #{DEL_FLAG_DELETE}
+        WHERE id = #{id}
+    </update>
+</mapper>

src/main/java/com/jeeplus/modules/sg/fund/service/FundService.java

@@ -0,0 +1,58 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.fund.service;
+
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.fund.entity.Fund;
+import com.jeeplus.modules.sg.fund.mapper.FundMapper;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.EngineeringAmount;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.OtherAmount;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
+import com.jeeplus.modules.sg.managementcenter.activiti.mapper.ConstructionMapper;
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
+import com.jeeplus.modules.sys.entity.User;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 施工交底Service
+ * @author
+ * @version 2019-11-08
+ */
+@Service
+@Transactional(readOnly = true)
+public class FundService extends CrudService<FundMapper, Fund> {
+
+	@Autowired
+	private FundMapper fundMapper;
+
+	public Fund get(String id) {
+		Fund fund = super.get(id);
+		return fund;
+	}
+
+	@Override
+	public void delete(Fund entity) {
+		super.delete(entity);
+	}
+
+	//修改项目wbs
+	@Transactional(readOnly = false)
+	public void updateWbs(String wbsEncoding, String procInsId) {
+				fundMapper.updateWbs(wbsEncoding, procInsId);
+	}
+
+	//修改项目资产卡片号
+	@Transactional(readOnly = false)
+	public void updateAsset(String assetCardNumber, String procInsId) {
+		fundMapper.updateAsset(assetCardNumber, procInsId);
+	}
+}

src/main/java/com/jeeplus/modules/sg/fund/web/FundController.java

@@ -0,0 +1,320 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.fund.web;
+
+import com.google.common.collect.Maps;
+import com.jeeplus.common.config.Global;
+import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.common.utils.DateUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.excel.ImportExcel;
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.act.entity.Act;
+import com.jeeplus.modules.act.service.ActProcessService;
+import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.sg.audit.information.entity.Information;
+import com.jeeplus.modules.sg.audit.information.utils.RandomUtil;
+import com.jeeplus.modules.sg.fund.entity.Fund;
+import com.jeeplus.modules.sg.fund.service.FundService;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.*;
+import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
+import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo;
+import com.jeeplus.modules.sg.managementcenter.materialinfo.service.MaterialInfoService;
+import com.jeeplus.modules.sg.managementcenter.materialproject.service.MaterialProjectService;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
+import com.jeeplus.modules.sg.materialmodule.activiti.entity.NonPower;
+import com.jeeplus.modules.sg.materialmodule.activiti.service.NonPowerService;
+import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
+import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.utils.DictUtils;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.*;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 施工交底Controller
+ *
+ * @author
+ * @version 2019-11-08
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/fund")
+
+public class FundController extends BaseController {
+    @Autowired
+    private FundService fundService;
+    @Autowired
+    private ActProcessService actProcessService;
+    @Autowired
+    private ActTaskService actTaskService;
+    @Autowired
+    private ProjectService projectService;
+
+    @ModelAttribute
+    public Fund get(@RequestParam(required = false) String id) {
+        Fund entity = null;
+        if (StringUtils.isNotBlank(id)) {
+            entity = fundService.get(id);
+        }
+        if (entity == null) {
+            entity = new Fund();
+        }
+        return entity;
+    }
+
+    /**
+     * 项目转资信息管理页面
+     */
+    @RequestMapping(value = "fundList")
+    public String fundList(Fund fund, Model model) {
+        model.addAttribute("fund", fund);
+        return "modules/sg/fund/fundList";
+    }
+
+    /**
+     * 转资流程开始选择项目页面
+     */
+    @RequestMapping(value = "fundStart")
+    public String fundStart(Fund fund, Model model) {
+        model.addAttribute("fund", fund);
+        return "modules/sg/fund/fundStart";
+    }
+
+    /**
+     * 转资流程填写wbs编码
+     */
+    @RequestMapping(value = "wbsForm")
+    public String wbsForm(Fund fund, Model model) {
+        model.addAttribute("fund", fund);
+        return "modules/sg/fund/wbsForm";
+    }
+
+    /**
+     * 转资流程填写资产卡片号
+     */
+    @RequestMapping(value = "assetForm")
+    public String assetForm(Fund fund, Model model) {
+        model.addAttribute("fund", fund);
+        return "modules/sg/fund/assetForm";
+    }
+
+    /**
+     * 项目管理列表数据
+     */
+    @ResponseBody
+    @RequiresPermissions("modules:sg:information:information:list")
+    @RequestMapping(value = "data")
+    public Map<String, Object> data(Fund fund, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<Fund> page = fundService.findPage(new Page<Fund>(request, response), fund);
+        return getBootstrapData(page);
+    }
+
+    /**
+     * 土建工程量添加，修改
+     */
+    @ResponseBody
+    @RequestMapping(value = "EngAmountSave")
+    public AjaxJson EngAmountSave(EngineeringAmount engineeringAmount, Model model) throws Exception {
+        AjaxJson j = new AjaxJson();
+        try {
+//            constructionService.EngAmountSave(engineeringAmount);
+            j.setSuccess(true);
+            j.setMsg("修改成功");
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("修改失败");
+        }
+        return j;
+    }
+
+    /**
+     * 其它工程量添加，修改
+     */
+    @ResponseBody
+    @RequestMapping(value = "addOther")
+    public AjaxJson addOther(OtherAmount otherAmount, Model model) throws Exception {
+        AjaxJson j = new AjaxJson();
+        try {
+//            constructionService.addOther(otherAmount);
+            j.setSuccess(true);
+            j.setMsg("修改成功");
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("修改失败");
+        }
+        return j;
+    }
+
+    /**
+     * 土建工程量删除
+     */
+    @ResponseBody
+    @RequestMapping(value = "delEngAmount")
+    public AjaxJson delEngAmount(Fund fund) {
+        AjaxJson j = new AjaxJson();
+        fundService.delete(fund);
+        j.setMsg("删除工程量成功");
+        return j;
+    }
+
+
+    /**
+     * 下载施工交底模板文件
+     */
+    @RequestMapping(value = "excelOut")
+    public void excelStandardTemplateOut(HttpServletRequest request,
+                                         HttpServletResponse response) throws IOException {
+        String fileName = "disclose.xlsx";
+        String filePath = getClass().getResource("/freemarker/" + fileName).getPath();
+        File f = new File(filePath);
+        // 设置response参数，可以打开下载页面
+        response.reset();
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        try {
+            response.setHeader("Content-Disposition", "attachment;filename=" + new String(("交底结论模板" + ".xlsx").getBytes(), "iso-8859-1"));//下载文件的名称
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        ServletOutputStream out = response.getOutputStream();
+        BufferedInputStream bis = null;
+        BufferedOutputStream bos = null;
+        try {
+            bis = new BufferedInputStream(new FileInputStream(f));
+            bos = new BufferedOutputStream(out);
+            byte[] buff = new byte[2048];
+            int bytesRead;
+            while (-1 != (bytesRead = bis.read(buff, 0, buff.length))) {
+                bos.write(buff, 0, bytesRead);
+            }
+        } catch (final IOException e) {
+            throw e;
+        } finally {
+            if (bis != null)
+                bis.close();
+            if (bos != null)
+                bos.close();
+        }
+    }
+
+    /**
+     * 发起施工交底流程
+     */
+    @ResponseBody
+    @RequestMapping(value = "save")
+    public AjaxJson save(Fund fund, Model model) throws Exception {
+        AjaxJson j = new AjaxJson();
+        /**
+         * 后台hibernate-validation插件校验
+         */
+        String projectId = fund.getProjectId();
+        if (null == projectId || "".equals(projectId)) {
+            j.setSuccess(false);
+            j.setMsg("请选择项目");
+            return j;
+        }
+        String errMsg = beanValidator(fund);
+        if (StringUtils.isNotBlank(errMsg)) {
+            j.setSuccess(false);
+            j.setMsg(errMsg);
+            return j;
+        }
+        /**
+         * 流程审批
+         */
+        if (StringUtils.isBlank(fund.getId())) {
+            //获取流程图id
+            String procDefId = fund.getAct().getProcDefId();
+            //定义vars用于指派流程走向
+            Map<String, Object> vars = Maps.newHashMap();
+            Project project = new Project();
+            project.setId(projectId);
+            //获取选择的项目
+            Project ass = projectService.getAss(project);
+            if (null == ass) {
+                j.setSuccess(false);
+                j.setMsg("请选完善项目信息");
+                return j;
+            }
+            if (null == ass.getAssignment()) {
+                j.setSuccess(false);
+                j.setMsg("请先填写人员信息");
+                return j;
+            }
+            fund.setId("");
+            fund.setProjectId(ass.getProjectId());
+            fund.setProjectName(ass.getProjectName());
+            fund.setReserveProjectName(ass.getReserveProjectName());
+            fundService.save(fund);
+            vars.put("manager", UserUtils.getByUserName(ass.getAssignment().getOwnerManager()).getLoginName());
+
+            // 启动流程
+            ProcessDefinition p = actProcessService.getProcessDefinition(fund.getAct().getProcDefId());
+            String title = fund.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+            actTaskService.startProcessNew(p.getKey(), "xm_fund_process", fund.getId(), title, vars);
+            //新增或编辑表单保存
+            j.setMsg("发起流程审批成功!");
+            j.getBody().put("targetUrl", "/act/task/process/");
+        }
+        return j;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "wbsTask")
+    public AjaxJson wbsTask(Act act, String wbsEncoding) {
+        AjaxJson j = new AjaxJson();
+        try {
+            fundService.updateWbs(wbsEncoding, act.getProcInsId());
+            String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+            act.setComment(comment);
+            actTaskService.wbsTask(act);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        j.setMsg("审批成功");
+        return j;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "assetTask")
+    public AjaxJson assetTask(Act act, String assetCardNumber) {
+        AjaxJson j = new AjaxJson();
+        try {
+            fundService.updateAsset(assetCardNumber, act.getProcInsId());
+            String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+            act.setComment(comment);
+            actTaskService.assetTask(act);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        j.setMsg("审批成功");
+        return j;
+    }
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/MyActiviUtils.java

@@ -269,6 +269,13 @@ public class MyActiviUtils {
         return user;
     }
 
+    /**
+     * 通过流程定义号查询项目的流转人员信息-转资流程
+     * */
+    public static Project findFundUser(String procInsId) {
+        Project user = projectService.findFundUser(procInsId);
+        return user;
+    }
 
     /**
      * 通过流程定义id查询项目流转人员信息-土建流程

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/ProjectMapper.java

@@ -176,8 +176,6 @@ public interface ProjectMapper extends BaseMapper<Project> {
     Project findMaterialProject(String id);
     /*#################################################################################################*/
 
-
-
     /**
      * 根据改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底
      * */
@@ -217,6 +215,8 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     Project findJSUser(String procInsId);
 
+    Project findFundUser(String procInsId);
+
     Project findUserById(String projectId);
 
     Integer updatePreConstruction(Project1 project);

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -1358,9 +1358,19 @@
                design_unit_manage,
                design_unit_leader
         FROM xm_project_details
-        WHERE require_name = (select requireName from xm_settlement_process where proc_ins_id = #{procInsId});
+        WHERE require_name = (select projectName from xm_settlement_process where proc_ins_id = #{procInsId});
     </select>
 
+    <select id="findFundUser" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
+        select
+        <include refid="assignmentColumns"/>
+        FROM xm_project_assignment c
+        WHERE reserveProjectName = (
+            select reserveProjectName
+            from xm_fund_process
+            where proc_ins_id =#{procInsId}
+            );
+    </select>
 
     <select id="findUserById" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
         select id,

src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -276,6 +276,13 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
     }
 
     /**
+     * 通过流程定义号查询项目的流转人员信息-转资流程
+     */
+    public Project findFundUser(String procInsId) {
+        return projectMapper.findFundUser(procInsId);
+    }
+
+    /**
      * 根据储备项目名称查询项目的
      */
     @Transactional(readOnly = false)

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -336,8 +336,18 @@ public class ProjectController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "settData")
     public Map<String, Object> settData(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
-        //project1.setSettStatus("0");
-        //project1.setConstructionStatus("2");
+        project.setSettStatus("0");
+        project.setConstructionStatus("2");
+        Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
+        return getBootstrapData(page);
+    }
+
+    /**
+     * 表单列表数据
+     */
+    @ResponseBody
+    @RequestMapping(value = "fundData")
+    public Map<String, Object> fundData(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
         Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
         return getBootstrapData(page);
     }

src/main/java/com/jeeplus/modules/sg/settActivi/mapper/xml/SettActiviMapper.xml

@@ -43,6 +43,22 @@
         WHERE id = #{id}
     </update>
 
+    <select id="get" resultType="SettActivi">
+        SELECT id,
+               create_by,
+               create_date,
+               update_by,
+               update_date,
+               del_flag,
+               remarks,
+               projectId,
+               projectName,
+               proc_ins_id,
+               reserveProjectName
+        from xm_settlement_process
+        WHERE id = #{id};
+
+    </select>
 
     <!--物理删除-->
     <update id="delete">
@@ -141,13 +157,13 @@
         </foreach>
     </insert>
     <select id="findAllSett" resultType="com.jeeplus.modules.sg.settActivi.entity.SettActivi">
-        select a.id,a.projectId,a.requireName,a.proc_ins_id,b.construction_unit_manage from xm_settlement_process a
+        select a.id,a.projectId,a.reserveProjectName,a.proc_ins_id,b.construction_unit_manage from xm_settlement_process a
         left join xm_project_details b
         on a.projectId = b.project_id
-        where a.requireName in
+        where a.reserveProjectName in
         (
         <foreach collection="list" item="item" separator=",">
-            #{item.requireName}
+            #{item.reserveProjectName}
         </foreach>
         )
     </select>
@@ -213,7 +229,7 @@
     </update>
 
     <select id="exportFind" resultType="com.jeeplus.modules.sg.settActivi.entity.SettActivi">
-        select a.requireName, b.project_id, b.construction_unit_manage
+        select a.reserveProjectName, b.project_id, b.construction_unit_manage
         from xm_settlement_process a
                  left join xm_project_details b
                            on a.projectId = b.project_id
@@ -233,7 +249,6 @@
         projectName,
         reserveProjectName
         )VALUES
-        <foreach collection="list" item="item" index="index" separator=",">
             (
             #{item.id},
             #{item.createBy.id},
@@ -246,6 +261,5 @@
             #{item.projectName},
             #{item.reserveProjectName}
             )
-        </foreach>
     </insert>
 </mapper>

src/main/java/com/jeeplus/modules/sg/settActivi/service/SettActiviService.java

@@ -17,6 +17,7 @@ import java.util.List;
 
 /**
  * 模块显示Service
+ *
  * @author
  * @version 2019-11-08
  */
@@ -28,6 +29,11 @@ public class SettActiviService extends CrudService<SettActiviMapper, SettActivi>
 	private SettActiviMapper settActiviMapper;
 
 	@Override
+	public SettActivi get(SettActivi entity) {
+		return super.get(entity);
+	}
+
+	@Override
 	public Page<SettActivi> findPage(Page<SettActivi> page, SettActivi entity) {
 		return super.findPage(page, entity);
 	}
@@ -39,6 +45,12 @@ public class SettActiviService extends CrudService<SettActiviMapper, SettActivi>
 		return page;
 	}
 
+
+	public List<SettList> findUseQuantityData(SettList settList) {
+		return settActiviMapper.findUseQuantityData(settList);
+	}
+
+
 	//根据项目idList查询项目信息
 	public List<Project1> findByIdList(List<String> projectId) {
 		return settActiviMapper.findByIdList(projectId);
@@ -77,7 +89,7 @@ public class SettActiviService extends CrudService<SettActiviMapper, SettActivi>
 
 	/**
 	 * 修改项目的
-	 * */
+	 */
 	@Transactional(readOnly = false)
 	public void updateUsed(SettList settList) {
 		settActiviMapper.updateUsed(settList);
@@ -103,8 +115,9 @@ public class SettActiviService extends CrudService<SettActiviMapper, SettActivi>
 		return settActiviMapper.exportFind(procInsId);
 	}
 
-	@Transactional(readOnly =false)
+	@Transactional(readOnly = false)
 	public void insertSett(SettActivi settActivi) {
+		settActivi.preInsert();
 		settActiviMapper.insertSett(settActivi);
 	}
 }

src/main/java/com/jeeplus/modules/sg/settActivi/web/SettActiviController.java

@@ -10,9 +10,13 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.sg.audit.information.entity.Information;
 import com.jeeplus.modules.sg.audit.information.utils.FreemarkerUtil;
+import com.jeeplus.modules.sg.audit.information.utils.ImportInformation;
 import com.jeeplus.modules.sg.audit.information.utils.ResponseUtil;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
+import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sg.settActivi.entity.SettActivi;
 import com.jeeplus.modules.sg.settActivi.entity.SettList;
 import com.jeeplus.modules.sg.settActivi.service.SettActiviService;
@@ -21,10 +25,13 @@ import freemarker.template.Configuration;
 import freemarker.template.Template;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.apache.poi.ss.usermodel.Row;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -42,6 +49,20 @@ public class SettActiviController extends BaseController {
     private ActProcessService actProcessService;
     @Autowired
     private ActTaskService actTaskService;
+    @Autowired
+    private ProjectService projectService;
+
+    @ModelAttribute
+    public SettActivi get(@RequestParam(required = false) String id) {
+        SettActivi entity = null;
+        if (StringUtils.isNotBlank(id)) {
+            entity = settActiviService.get(id);
+        }
+        if (entity == null) {
+            entity = new SettActivi();
+        }
+        return entity;
+    }
 
     /**
      * 填写项目表
@@ -132,16 +153,15 @@ public class SettActiviController extends BaseController {
     }
 
 
-
     /**
      * 导出excel文件
      */
     @ResponseBody
     @RequestMapping(value = "exportSett")
-    public AjaxJson exportSett(SettList settList, HttpServletRequest request, HttpServletResponse response){
+    public AjaxJson exportSett(SettList settList, HttpServletRequest request, HttpServletResponse response) {
         AjaxJson j = new AjaxJson();
         try {
-            String fileName = "竣工甲供材核对表"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+            String fileName = "竣工甲供材核对表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
             Page<SettList> page = settActiviService.useQuantityData(new Page<SettList>(request, response), settList);
             new ExportExcel("竣工甲供材核对表", SettList.class).setDataList(page.getList()).write(response, fileName).dispose();
             j.setSuccess(true);
@@ -149,7 +169,7 @@ public class SettActiviController extends BaseController {
             return j;
         } catch (Exception e) {
             j.setSuccess(false);
-            j.setMsg("导出需求基本信息记录失败！失败信息："+e.getMessage());
+            j.setMsg("导出需求基本信息记录失败！失败信息：" + e.getMessage());
         }
         return j;
     }
@@ -160,7 +180,7 @@ public class SettActiviController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "save")
-    public AjaxJson save(MultipartFile file, HttpServletResponse response, HttpServletRequest request, SettActivi settActivi, Model model) throws Exception {
+    public AjaxJson save(HttpServletResponse response, HttpServletRequest request, SettActivi settActivi, Model model) throws Exception {
         AjaxJson j = new AjaxJson();
         /**
          * 后台hibernate-validation插件校验
@@ -171,25 +191,32 @@ public class SettActiviController extends BaseController {
             j.setSuccess(false);
             return j;
         }
-        if (null == file || file.getSize() <= 0) {
-            j.setMsg("请导入文件");
-            j.setSuccess(false);
-            return j;
-        }
+
         String errMsg = beanValidator(settActivi);
         if (StringUtils.isNotBlank(errMsg)) {
             j.setSuccess(false);
             j.setMsg(errMsg);
             return j;
         }
-        String[] split = projectId.split(",");
-        List<String> searchList = new ArrayList<>();
-        for (int i = 0; i < split.length; i++) {
-            searchList.add(split[i]);
-        }
+        Map<String, Object> vars = Maps.newHashMap();
         //根据选择的项目查询项目信息
-        List<Project1> byIdList = settActiviService.findByIdList(searchList);
-        //读取文件，获取文件信息
+        Project project = new Project();
+        project.setId(settActivi.getProjectId());
+        Project ass = projectService.getAss(project);
+        settActivi.setProjectId(ass.getProjectId());
+        settActivi.setProjectName(ass.getProjectName());
+        settActivi.setReserveProjectName(ass.getReserveProjectName());
+        settActiviService.insertSett(settActivi);
+        projectService.updateJsStatus("1", ass.getReserveProjectName());
+        vars.put("manager", UserUtils.getByUserName(ass.getAssignment().getOwnerManager()).getLoginName());
+        ProcessDefinition p = actProcessService.getProcessDefinition(settActivi.getAct().getProcDefId());
+        String title = UserUtils.getUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+        actTaskService.startProcess(p.getKey(), "xm_settlement_process", settActivi.getId(), title, vars);
+      /*  vars.put("manager", UserUtils.getByUserName(byIdList.get()).getLoginName());
+        ProcessDefinition p = actProcessService.getProcessDefinition(settActivi.getAct().getProcDefId());
+        String title = settActivi.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+        actTaskService.startProcess(p.getKey(), "xm_settlement_process", set.getId(), title, vars);*/
+       /* //读取文件，获取文件信息
         ImportExcel importExcel = new ImportExcel(file, 1, 0);
         int lastDataRowNum = importExcel.getLastDataRowNum();
         Row row = null;
@@ -249,14 +276,13 @@ public class SettActiviController extends BaseController {
             if (lists.size()>0) {
                 settActiviService.insertSettList(lists);
             }
-        }
+        }*/
         j.setMsg("发起领料流程成功!");
         j.getBody().put("targetUrl", "/act/task/process/");
         return j;
     }
 
 
-
     //导出excel
     @ResponseBody
     @RequestMapping(value = "exportExcel")
@@ -286,7 +312,7 @@ public class SettActiviController extends BaseController {
         }
         data.put("list", list);
         SettActivi settActivi = settActiviService.exportFind(settList.getProcInsId());
-        data.put("projectId",settActivi.getProjectId());
+        data.put("projectId", settActivi.getProjectId());
         data.put("projectName", settActivi.getProjectName());
         data.put("manager", settActivi.getConstructionUnitManage());
         File docFile = new File(path + "\\镇江本部配网工程竣工甲供材核对表.xls");
@@ -294,6 +320,66 @@ public class SettActiviController extends BaseController {
         ResponseUtil.docResponse("镇江本部配网工程竣工甲供材核对表.xls", docFile, response);
     }
 
+    //导入明细账信息
+    @ResponseBody
+    @RequestMapping(value = "importLedger")
+    public AjaxJson importLedger(@RequestParam("file") MultipartFile file, SettActivi settActivi, HttpServletRequest request, HttpServletResponse response, Model model) {
+        AjaxJson j = new AjaxJson();
+        try {
+            ImportExcel importExcel = new ImportExcel(file, 1, 0);
+            int lastDataRowNum = importExcel.getLastDataRowNum();
+            Row row = null;
+            List<SettList> settLists = new ArrayList<>();
+            for (int i = 1; i < lastDataRowNum; i++) {
+                SettList settList = new SettList();
+                row = importExcel.getRow(i);
+                //项目定义编码
+                Object projectNumber = importExcel.getCellValue(row, 10);
+                //项目名称
+                Object requireName = importExcel.getCellValue(row, 11);
+                //金额
+                Object totalPrice = importExcel.getCellValue(row, 15);
+                //数量
+                Object outgoingQuantity = importExcel.getCellValue(row, 16);
+                //编码
+                Object materialEncoding = importExcel.getCellValue(row, 18);
+                //描述
+                Object materialName = importExcel.getCellValue(row, 19);
+                //单位
+                Object company = importExcel.getCellValue(row, 20);
+                settList.setProjectId(projectNumber.toString());
+                settList.setMaterialEncoding(materialEncoding.toString());
+                settList.setMaterialName(materialName.toString());
+                settList.setCompany(company.toString());
+                settList.setRequireName(requireName.toString());
+                Double oQ = Double.valueOf(outgoingQuantity.toString());
+                Double tP = Double.valueOf(totalPrice.toString());
+                settList.setOutgoingQuantity(oQ);
+                settList.setTotalPrice(tP);
+                double v = tP / oQ;
+                settList.setUnitPrice(v);
+                settLists.add(settList);
+            }
+            List<SettList> insertList = new ArrayList<>();
+            if (null != settLists && settLists.size()>0) {
+                for (SettList s :
+                        settLists) {
+                    if (settActivi.getReserveProjectName().equals(s.getRequireName())) {
+                        s.setProcInsId(settActivi.getAct().getProcInsId());
+                        insertList.add(s);
+                    }
+                }
+                if (insertList.size() > 0) {
+                    settActiviService.insertSettList(insertList);
+                }
+            }
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("导入项目原因！失败信息：" + e.getMessage());
+        }
+        return j;
+    }
+
 }
 
 

src/main/resources/freemarker/jiesuan.ftl

@@ -142,12 +142,12 @@
     <Cell ss:MergeAcross="9" ss:StyleID="s59"><Data ss:Type="String">镇江本部配网工程竣工甲供材核对表</Data></Cell>
    </Row>
    <Row ss:StyleID="s42">
-    <Cell ss:StyleID="s46"><Data ss:Type="String">项目编号：${projectId}</Data></Cell>
+    <Cell ss:StyleID="s46"><Data ss:Type="String">项目编号：${projectId!""}</Data></Cell>
     <Cell ss:StyleID="s46"/>
-    <Cell ss:StyleID="s46"><Data ss:Type="String">项目名称：${projectName}</Data></Cell>
+    <Cell ss:StyleID="s46"><Data ss:Type="String">项目名称：${projectName!""}</Data></Cell>
     <Cell ss:StyleID="s46"/>
     <Cell ss:StyleID="s46"/>
-    <Cell ss:StyleID="s46"><Data ss:Type="String">施工项目经理：${manager}</Data></Cell>
+    <Cell ss:StyleID="s46"><Data ss:Type="String">施工项目经理：${manager!""}</Data></Cell>
     <Cell ss:StyleID="s46"/>
     <Cell ss:StyleID="s46"/>
     <Cell ss:StyleID="s46"/>
@@ -177,16 +177,16 @@
    </Row>
    <#list list as item>
    <Row>
-		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.id}</Data></Cell>
-		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.materialEncoding}</Data></Cell>
-		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.materialName}</Data></Cell>
-		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.company}</Data></Cell>
-		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.unitPrice}</Data></Cell>
-       <Cell ss:StyleID="s49"><Data ss:Type="String">${item.totalPrice}</Data></Cell>
-		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.outgoingQuantity}</Data></Cell>
-		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.usedQuantity}</Data></Cell>
-		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.reviewQuantity}</Data></Cell>
-		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.settMark}</Data></Cell>
+		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.id!""}</Data></Cell>
+		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.materialEncoding!""}</Data></Cell>
+		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.materialName!""}</Data></Cell>
+		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.company!""}</Data></Cell>
+		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.unitPrice!""}</Data></Cell>
+       <Cell ss:StyleID="s49"><Data ss:Type="String">${item.totalPrice!""}</Data></Cell>
+		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.outgoingQuantity!""}</Data></Cell>
+		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.usedQuantity!""}</Data></Cell>
+		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.reviewQuantity!""}</Data></Cell>
+		<Cell ss:StyleID="s49"><Data ss:Type="String">${item.settMark!""}</Data></Cell>
    </Row>
    </#list>
    <Row  ss:Height="14.0625" ss:StyleID="s43">

src/main/webapp/webpage/modules/sg/audit/information/informationList.jsp

@@ -1,180 +1,191 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ include file="/webpage/include/taglib.jsp" %>
 <html>
 <head>
-	<title>项目管理列表页</title>
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-	<meta name="decorator" content="ani"/>
-	<%@ include file="/webpage/include/bootstraptable.jsp"%>
-	<%@include file="/webpage/include/treeview.jsp" %>
-	<%@include file="informationList.js" %>
-	<style type="text/css">
-		.table {
-			table-layout:fixed;
-			word-break:break-all;
-			word-wrap:break-word;
-			text-align: center;
-		}
-		.table th, .table td {
-			text-align: center;
-			vertical-align: middle!important;
-		}
-	</style>
+    <title>项目管理列表页</title>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <meta name="decorator" content="ani"/>
+    <%@ include file="/webpage/include/bootstraptable.jsp" %>
+    <%@include file="/webpage/include/treeview.jsp" %>
+    <%@include file="informationList.js" %>
+    <style type="text/css">
+        .table {
+            table-layout: fixed;
+            word-break: break-all;
+            word-wrap: break-word;
+            text-align: center;
+        }
+
+        .table th, .table td {
+            text-align: center;
+            vertical-align: middle !important;
+        }
+    </style>
 </head>
 <body>
-	<div class="wrapper wrapper-content">
-	<div class="panel panel-primary">
-	<div class="panel-heading">
-		<h3 class="panel-title">项目管理列表</h3>
-	</div>
-	<div class="panel-body">
-	
-	<!-- 搜索 -->
-	<div id="search-collapse" class="collapse">
-		<div class="accordion-inner">
-			<form:form id="searchForm" modelAttribute="information" class="form form-horizontal well clearfix">
-			 <div class="col-xs-12 col-sm-6 col-md-4">
-				<label class="label-item single-overflow pull-left" title="项目定义号：">项目定义号：</label>
-				 <form:input path="projectId" htmlEscape="false" class=" form-control"/>
-			</div>
-			 <div class="col-xs-12 col-sm-6 col-md-4">
-				<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
-				<form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
-			</div>
-			 <div class="col-xs-12 col-sm-6 col-md-4">
-				<div class="form-group">
-					<label class="label-item single-overflow pull-left" title="项目类型：">&nbsp;项目类型：</label>
-					<form:input path="projectType" htmlEscape="false" maxlength="100"  class=" form-control"/>
-				</div>
-			</div>
-				<div class="col-xs-12 col-sm-6 col-md-4">
-					<div class="form-group">
-						<label class="label-item single-overflow pull-left" title="项目预算年度：">&nbsp;项目预算年度：</label>
-						<form:input path="projectYear" htmlEscape="false" maxlength="100"  class=" form-control"/>
-					</div>
-				</div>
-			 <div class="col-xs-12 col-sm-6 col-md-4">
-				 <div class="form-group">
-					<label class="label-item single-overflow pull-left" title="一级单位：">&nbsp;一级单位：</label>
-					 <form:input path="firstUnits" htmlEscape="false" maxlength="100"  class=" form-control"/>
-				</div>
-			</div>
-				<div class="col-xs-12 col-sm-6 col-md-4">
-					<div class="form-group">
-						<label class="label-item single-overflow pull-left" title="二级单位：">&nbsp;二级单位：</label>
-						<form:input path="secondUnits" htmlEscape="false" maxlength="100"  class=" form-control"/>
-					</div>
-				</div>
-				<div class="col-xs-12 col-sm-6 col-md-4">
-					<div class="form-group">
-						<label class="label-item single-overflow pull-left" title="是否完成领退料：">&nbsp;是否完成领退料：</label>
-						<form:select path="firstFinish" htmlEscape="false" maxlength="100"  class=" form-control">
-							<form:option value="">请选择</form:option>
-							<form:option value="是">是</form:option>
-							<form:option value="否">否</form:option>
-						</form:select>
-					</div>
-				</div>
-				<div class="col-xs-12 col-sm-6 col-md-4">
-					<div class="form-group">
-						<label class="label-item single-overflow pull-left" title="选择查询的情况：">&nbsp;选择查询的情况：</label>
-						<form:select path="extendedStatus" htmlEscape="false" maxlength="100"  class=" form-control">
-							<form:option value="">请选择</form:option>
-							<form:option value="大于等于"> 大于等于</form:option>
-							<form:option value="大于"> 大于</form:option>
-							<form:option value="等于"> 等于</form:option>
-							<form:option value="小于等于"> 小于等于 </form:option>
-							<form:option value="小于"> 小于</form:option>
-						</form:select>
-					</div>
-				</div>
-				<div class="col-xs-12 col-sm-6 col-md-4">
-					<div class="form-group">
-						<label class="label-item single-overflow pull-left" title="输入天数：">&nbsp;输入天数：</label>
-						<form:input path="extendedTime" htmlEscape="false" maxlength="100"  class=" form-control"/>
-					</div>
-				</div>
-<%--用于记录是否时第一次刷新--%>
-				<form:hidden path="hiddenSign"/>
-<%--				<form:input type="hidden" id="hiddenSign"/>--%>
-		 <div class="col-xs-12 col-sm-6 col-md-4">
-			<div style="margin-top:26px">
-			  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
-			  <a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
-			 </div>
-	    </div>	
-	</form:form>
-	</div>
-	</div>
-	
-	<!-- 工具栏 -->
-	<div id="toolbar">
-<%--		<shiro:hasPermission name="modules:sg:information:information:import">
-			<button id="btnCom" class="btn btn-info">
-				<i class="fa fa-folder-open-o"></i> 导入综合信息表
-			</button>
-		</shiro:hasPermission>
-		<shiro:hasPermission name="modules:sg:information:information:import">
-			<button id="btnInformation" class="btn btn-info">
-				<i class="fa fa-folder-open-o"></i> 导入甲供材
-			</button>
-		</shiro:hasPermission>--%>
-		<shiro:hasPermission name="modules:sg:information:information:importReason">
-			<button id="btnInReason" class="btn btn-info">
-				<i class="fa fa-folder-open-o"></i> 导入原因类型
-			</button>
-		</shiro:hasPermission>
-		<shiro:hasPermission name="modules:sg:information:information:importTrial">
-			<button id="btnInTrial" class="btn btn-info">
-				<i class="fa fa-folder-open-o"></i> 导入送审
-			</button>
-		</shiro:hasPermission>
-		<shiro:hasPermission name="modules:sg:information:information:import">
-			<button id="btnSearch" class="btn btn-info">
-				<i class="fa fa-folder-open-o"></i> 导入查询
-			</button>
-		</shiro:hasPermission>
-		<shiro:hasPermission name="modules:sg:information:information:export">
-			<button id="exportMaterial" class="btn btn-warning">
-				<i class="fa fa-file-excel-o"></i> 导出项目
-			</button>
-		</shiro:hasPermission>
-		<shiro:hasPermission name="modules:sg:information:information:export">
-			<button id="export" class="btn btn-warning">
-				<i class="fa fa-file-excel-o"></i> 导出物料清单
-			</button>
-		</shiro:hasPermission>
-		<shiro:hasPermission name="modules:sg:information:information:export">
-			<button id="exportInformation" class="btn btn-warning">
-				<i class="fa fa-file-excel-o"></i> 导出欠供说明
-			</button>
-		</shiro:hasPermission>
-<%--		<shiro:hasPermission name="modules:sg:information:information:edit">
-			<button id="editOverTime" class="btn btn-danger">
-				<i class="fa fa-file-excel-o"></i> 配置超期时间
-			</button>
-		</shiro:hasPermission>--%>
-		    </div>
-		
-	<!-- 表格 -->
-	<table id="informationTable"   data-toolbar="#toolbar" class="table" style="table-layout:fixed"></table>
+<div class="wrapper wrapper-content">
+    <div class="panel panel-primary">
+        <div class="panel-heading">
+            <h3 class="panel-title">项目管理列表</h3>
+        </div>
+        <div class="panel-body">
+            <!-- 搜索 -->
+            <div id="search-collapse" class="collapse">
+                <div class="accordion-inner">
+                    <form:form id="searchForm" modelAttribute="information" class="form form-horizontal well clearfix">
+                        <div class="col-xs-12 col-sm-6 col-md-4">
+                            <label class="label-item single-overflow pull-left" title="项目定义号：">项目定义号：</label>
+                            <form:input path="projectId" htmlEscape="false" class=" form-control"/>
+                        </div>
+                        <div class="col-xs-12 col-sm-6 col-md-4">
+                            <label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+                            <form:input path="projectName" htmlEscape="false" maxlength="100" class=" form-control"/>
+                        </div>
+                        <div class="col-xs-12 col-sm-6 col-md-4">
+                            <div class="form-group">
+                                <label class="label-item single-overflow pull-left" title="项目类型：">&nbsp;项目类型：</label>
+                                <form:input path="projectType" htmlEscape="false" maxlength="100"
+                                            class=" form-control"/>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-sm-6 col-md-4">
+                            <div class="form-group">
+                                <label class="label-item single-overflow pull-left"
+                                       title="项目预算年度：">&nbsp;项目预算年度：</label>
+                                <form:input path="projectYear" htmlEscape="false" maxlength="100"
+                                            class=" form-control"/>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-sm-6 col-md-4">
+                            <div class="form-group">
+                                <label class="label-item single-overflow pull-left" title="一级单位：">&nbsp;一级单位：</label>
+                                <form:input path="firstUnits" htmlEscape="false" maxlength="100" class=" form-control"/>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-sm-6 col-md-4">
+                            <div class="form-group">
+                                <label class="label-item single-overflow pull-left" title="二级单位：">&nbsp;二级单位：</label>
+                                <form:input path="secondUnits" htmlEscape="false" maxlength="100"
+                                            class=" form-control"/>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-sm-6 col-md-4">
+                            <div class="form-group">
+                                <label class="label-item single-overflow pull-left"
+                                       title="是否完成领退料：">&nbsp;是否完成领退料：</label>
+                                <form:select path="firstFinish" htmlEscape="false" maxlength="100"
+                                             class=" form-control">
+                                    <form:option value="">请选择</form:option>
+                                    <form:option value="是">是</form:option>
+                                    <form:option value="否">否</form:option>
+                                </form:select>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-sm-6 col-md-4">
+                            <div class="form-group">
+                                <label class="label-item single-overflow pull-left"
+                                       title="选择查询的情况：">&nbsp;选择查询的情况：</label>
+                                <form:select path="extendedStatus" htmlEscape="false" maxlength="100"
+                                             class=" form-control">
+                                    <form:option value="">请选择</form:option>
+                                    <form:option value="大于等于"> 大于等于</form:option>
+                                    <form:option value="大于"> 大于</form:option>
+                                    <form:option value="等于"> 等于</form:option>
+                                    <form:option value="小于等于"> 小于等于 </form:option>
+                                    <form:option value="小于"> 小于</form:option>
+                                </form:select>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-sm-6 col-md-4">
+                            <div class="form-group">
+                                <label class="label-item single-overflow pull-left" title="输入天数：">&nbsp;输入天数：</label>
+                                <form:input path="extendedTime" htmlEscape="false" maxlength="100"
+                                            class=" form-control"/>
+                            </div>
+                        </div>
+                        <%--用于记录是否时第一次刷新--%>
+                        <form:hidden path="hiddenSign"/>
+                        <%--				<form:input type="hidden" id="hiddenSign"/>--%>
+                        <div class="col-xs-12 col-sm-6 col-md-4">
+                            <div style="margin-top:26px">
+                                <a id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i
+                                        class="fa fa-search"></i> 查询</a>
+                                <a id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i
+                                        class="fa fa-refresh"></i> 重置</a>
+                            </div>
+                        </div>
+                    </form:form>
+                </div>
+            </div>
+
+            <!-- 工具栏 -->
+            <div id="toolbar">
+                <%--		<shiro:hasPermission name="modules:sg:information:information:import">
+                            <button id="btnCom" class="btn btn-info">
+                                <i class="fa fa-folder-open-o"></i> 导入综合信息表
+                            </button>
+                        </shiro:hasPermission>
+                        <shiro:hasPermission name="modules:sg:information:information:import">
+                            <button id="btnInformation" class="btn btn-info">
+                                <i class="fa fa-folder-open-o"></i> 导入甲供材
+                            </button>
+                        </shiro:hasPermission>--%>
+                <shiro:hasPermission name="modules:sg:information:information:importReason">
+                    <button id="btnInReason" class="btn btn-info">
+                        <i class="fa fa-folder-open-o"></i> 导入原因类型
+                    </button>
+                </shiro:hasPermission>
+                <shiro:hasPermission name="modules:sg:information:information:importTrial">
+                    <button id="btnInTrial" class="btn btn-info">
+                        <i class="fa fa-folder-open-o"></i> 导入送审
+                    </button>
+                </shiro:hasPermission>
+                <shiro:hasPermission name="modules:sg:information:information:import">
+                    <button id="btnSearch" class="btn btn-info">
+                        <i class="fa fa-folder-open-o"></i> 导入查询
+                    </button>
+                </shiro:hasPermission>
+                <shiro:hasPermission name="modules:sg:information:information:export">
+                    <button id="exportMaterial" class="btn btn-warning">
+                        <i class="fa fa-file-excel-o"></i> 导出项目
+                    </button>
+                </shiro:hasPermission>
+                <shiro:hasPermission name="modules:sg:information:information:export">
+                    <button id="export" class="btn btn-warning">
+                        <i class="fa fa-file-excel-o"></i> 导出物料清单
+                    </button>
+                </shiro:hasPermission>
+                <shiro:hasPermission name="modules:sg:information:information:export">
+                    <button id="exportInformation" class="btn btn-warning">
+                        <i class="fa fa-file-excel-o"></i> 导出欠供说明
+                    </button>
+                </shiro:hasPermission>
+                <%--		<shiro:hasPermission name="modules:sg:information:information:edit">
+                            <button id="editOverTime" class="btn btn-danger">
+                                <i class="fa fa-file-excel-o"></i> 配置超期时间
+                            </button>
+                        </shiro:hasPermission>--%>
+            </div>
+
+            <!-- 表格 -->
+            <table id="informationTable" data-toolbar="#toolbar" class="table" style="table-layout:fixed"></table>
 
-    <!-- context menu -->
-    <%--<ul id="context-menu" class="dropdown-menu">
-    	<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:view">
-        <li data-item="view"><a>查看</a></li>
-        </shiro:hasPermission>
-    	<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:edit">
-        <li data-item="edit"><a>编辑</a></li>
-        </shiro:hasPermission>
-        <shiro:hasPermission name="test:onetomany:dialog:testDataMain1:del">
-        <li data-item="delete"><a>删除</a></li>
-        </shiro:hasPermission>
-        <li data-item="action1"><a>取消</a></li>
-    </ul>  --%>
-	</div>
-	</div>
-	</div>
+            <!-- context menu -->
+            <%--<ul id="context-menu" class="dropdown-menu">
+                <shiro:hasPermission name="test:onetomany:dialog:testDataMain1:view">
+                <li data-item="view"><a>查看</a></li>
+                </shiro:hasPermission>
+                <shiro:hasPermission name="test:onetomany:dialog:testDataMain1:edit">
+                <li data-item="edit"><a>编辑</a></li>
+                </shiro:hasPermission>
+                <shiro:hasPermission name="test:onetomany:dialog:testDataMain1:del">
+                <li data-item="delete"><a>删除</a></li>
+                </shiro:hasPermission>
+                <li data-item="action1"><a>取消</a></li>
+            </ul>  --%>
+        </div>
+    </div>
+</div>
 
 </body>
 </html>

src/main/webapp/webpage/modules/sg/fund/assetForm.js

@@ -0,0 +1,71 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+	<script>
+    /**
+     * 项目经理组织交底页面
+     * */
+    $(document).ready(function () {
+        jp.ajaxForm("#inputForm", function (data) {
+            if (data.success) {
+                jp.success(data.msg);
+                jp.go("${ctx}/managementcenter/divide");
+            } else {
+                jp.error(data.msg);
+                $("#inputForm").find("button:submit").button("reset");
+            }
+        });
+
+        $("#agree").click(function () {
+            var assetCardNumber = $("#assetCardNumber").val();
+            if (null == assetCardNumber || "" == assetCardNumber) {
+                jp.error("请先填写资产卡片号")
+            }
+            jp.prompt(" 审批意见", function (message) {
+                jp.post("${ctx}/fund/assetTask",
+                {
+                    "taskId": "${fund.act.taskId}",
+                    "taskName": "${fund.act.taskName}",
+                    "taskDefKey": "${fund.act.taskDefKey}",
+                    "procInsId": "${fund.act.procInsId}",
+                    "procDefId": "${fund.act.procDefId}",
+                    "flag":"yes",
+                    "assetCardNumber":assetCardNumber,
+                    "comment": window.encodeURI(message)
+                },
+                function (data) {
+                    if (data.success) {
+                        jp.success(data.msg);
+                        jp.go("${ctx}/act/task/todo");
+                    } else {
+                        jp.error(data.msg);
+                    }
+                })
+            });
+        });
+
+
+        $('#startTime').datetimepicker({
+            format: "YYYY-MM-DD HH:mm:ss"
+        });
+        $('#endTime').datetimepicker({
+            format: "YYYY-MM-DD HH:mm:ss"
+        });
+        //富文本初始化
+        $('#reason').summernote({
+            height: 300,
+            lang: 'zh-CN',
+            readonly: true,
+            callbacks: {
+                onChange: function (contents, $editable) {
+                    $("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+                }
+            }
+        });
+
+
+    })
+
+    //刷新列表
+    function refresh(){
+        location.reload();
+    }
+</script>

src/main/webapp/webpage/modules/sg/fund/assetForm.jsp

@@ -0,0 +1,172 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>项目经理交底页面</title>
+    <meta name="decorator" content="ani"/>
+    <!-- SUMMERNOTE -->
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <%@include file="assetForm.js" %>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <h3 class="panel-title">
+                        <h3 class="panel-title">配网运行人员填写资产卡片号</h3>
+                    </h3>
+                </div>
+                <div class="panel-body">
+                    <form:form id="inputForm" modelAttribute="fund" action="${ctx}/fund/updateAsset"
+                               method="post" class="form-horizontal">
+                        <form:hidden path="id"/>
+                        <form:hidden path="act.taskId"/>
+                        <form:hidden path="act.taskName"/>
+                        <form:hidden path="act.taskDefKey"/>
+                        <form:hidden path="act.procInsId"/>
+                        <form:hidden path="act.procDefId"/>
+                        <form:hidden id="flag" path="act.flag"/>
+                        <table class="table table-bordered">
+                            <tbody>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">储备项目暂定名称：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.reserveProjectName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">wbs编码：</label></td>
+                                <td class="width-35">
+                                    <form:input id="wbsEncoding" path="wbsEncoding" readonly="true"
+                                                cssClass="form-control required" placeholder="必填"/>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">资产卡片号：</label></td>
+                                <td class="width-35">
+                                    <form:input id="assetCardNumber" path="assetCardNumber"
+                                                cssClass="form-control required" placeholder="必填"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.projectId)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.projectName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">市公司：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.municipalCompany)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 县公司：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.countyCompany)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目性质：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.projectNature)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 需求单位：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.demandUnit)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">运维单位：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.operationUnit)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 供电区域：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.powerSupplyArea)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">网格编号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.gridNumber)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 单元格编号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.cellNumber)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目储备编号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.projectReserveNo)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">电网项目编号</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.gridProjectNo)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> ERP编号</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.erpNo)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">建设必要性及内容：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.necessityContent)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 变电站名称：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.subStationName)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">线路名称：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.lineName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目类型：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.projectType)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否迎峰度夏项目：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.whetherSummer)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 项目基本说明：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.basicDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">工区备注：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.workAreaRemarks)}
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </form:form>
+                    <div class="row">
+                        <div class="col-sm-3"></div>
+                        <div class="col-sm-6">
+                            <div class="form-group text-center">
+                                <input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="提交"/>&nbsp;
+                            </div>
+                        </div>
+                    </div>
+                    <c:if test="${not empty fund.id}">
+                        <act:flowChart procInsId="${fund.act.procInsId}"/>
+                        <act:histoicFlow procInsId="${fund.act.procInsId}"/>
+                    </c:if>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/fund/fundList.js

@@ -0,0 +1,125 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+	$(document).ready(function() {
+		$('#fundTable').bootstrapTable({
+			//请求方法
+			method: 'post',
+			//类型json
+			dataType: "json",
+			contentType: "application/x-www-form-urlencoded",
+			//显示检索按钮
+			showSearch: true,
+			//显示刷新按钮
+			showRefresh: true,
+			//显示切换手机试图按钮
+			showToggle: true,
+			//显示 内容列下拉框
+			showColumns: true,
+			//显示到处按钮
+			showExport: true,
+			//显示切换分页按钮
+			showPaginationSwitch: true,
+			//最低显示2行
+			minimumCountColumns: 2,
+			//是否显示行间隔色
+			striped: true,
+			//是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+			cache: false,
+			//是否显示分页（*）
+			pagination: true,
+			//排序方式
+			sortOrder: "asc",
+			//初始化加载第一页，默认第一页
+			pageNumber:1,
+			//每页的记录行数（*）
+			pageSize: 10,
+			//可供选择的每页的行数（*）
+			pageList: [10, 25, 50, 100],
+			//这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
+			url: "${ctx}/fund/data",
+			//默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+			//queryParamsType:'',
+			////查询参数,每次调用是会带上这个参数，可自定义
+			queryParams : function(params) {
+				var searchParam = $("#searchForm").serializeJSON();
+				searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
+				searchParam.pageSize = params.limit === undefined? -1 : params.limit;
+				searchParam.orderBy = params.sort === undefined? "" : params.sort+ " "+  params.order;
+				return searchParam;
+			},
+			//分页方式：client客户端分页，server服务端分页（*）
+			sidePagination: "server",
+			contextMenuTrigger:"right",//pc端 按右键弹出菜单
+			contextMenuTriggerMobile:"press",//手机端 弹出菜单，click：单击， press：长按。
+			contextMenu: '#context-menu',
+			onClickRow: function(row, $el){
+			},
+			onLoadSuccess: function () {  //加载成功时执行
+			},
+			onShowSearch: function () {
+				$("#search-collapse").slideToggle();
+			},
+			columns: [
+				{
+					field: 'projectId',
+					title: '项目定义号',
+					sortName: 'projectId'
+				}
+				,{
+					field: 'projectName',
+					title: '项目名称',
+					sortName: 'projectName'
+				}
+				,{
+					field: 'reserveProjectName',
+					title: '储备项目名称',
+					sortName: 'reserveProjectName'
+				}
+				,{
+					field: 'wbsEncoding',
+					title: 'wbs编码',
+					sortName: 'wbsEncoding'
+				}
+				,{
+					field: 'assetCardNumber',
+					title: '资产卡片号',
+					sortName: 'assetCardNumber'
+				}
+			],
+			formatNoMatches:function(){
+				return "没有对应数据";
+			},
+
+		})
+
+		jp.ajaxForm("#inputForm",function(data){
+			if(data.success){
+				jp.alert(data.msg);
+				jp.go("${ctx}"+ data.body.targetUrl);
+			}else{
+				jp.alert(data.msg);
+				$("#inputForm").find("button:submit").button("reset");
+			}
+		});
+
+		$('#acceptDate').datetimepicker({
+			format: "YYYY-MM-DD HH:mm:ss"
+		});
+
+		$('#examineDate').datetimepicker({
+			format: "YYYY-MM-DD HH:mm:ss"
+		});
+
+		//富文本初始化
+		$('#reason').summernote({
+			height: 300,
+			lang: 'zh-CN',
+			callbacks: {
+				onChange: function(contents, $editable) {
+					$("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+				}
+			}
+		});
+	})
+
+</script>

src/main/webapp/webpage/modules/sg/fund/fundList.jsp

@@ -0,0 +1,42 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>转资模块</title>
+    <meta name="decorator" content="ani"/>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <%@ include file="/webpage/include/bootstraptable.jsp" %>
+    <%@include file="fundList.js" %>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+    <div class="panel panel-primary">
+        <div class="panel-heading">
+                <h3 class="panel-title">项目转资信息管理</h3>
+        </div>
+        <div class="panel-body">
+            <div id="search-collapse" class="collapse">
+                <div class="accordion-inner">
+                    <form:form id="searchForm" modelAttribute="fund" class="form form-horizontal well clearfix">
+                        <div class="col-xs-12 col-sm-6 col-md-4">
+                            <label class="label-item single-overflow pull-left" title="项目定义号：">项目定义号：</label>
+                            <form:input path="projectId" htmlEscape="false" class=" form-control"/>
+                        </div>
+                        <div class="col-xs-12 col-sm-6 col-md-4">
+                            <div style="margin-top:26px">
+                                <a id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i
+                                        class="fa fa-search"></i> 查询</a>
+                                <a id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i
+                                        class="fa fa-refresh"></i> 重置</a>
+                            </div>
+                        </div>
+                    </form:form>
+                </div>
+            </div>
+            <table id="fundTable" data-toolbar="#toolbar" class="table" style="table-layout:fixed"></table>
+        </div>
+    </div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/fund/fundStart.js

@@ -0,0 +1,34 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+	$(document).ready(function() {
+		jp.ajaxForm("#inputForm",function(data){
+			if(data.success){
+				jp.alert(data.msg);
+				jp.go("${ctx}"+ data.body.targetUrl);
+			}else{
+				jp.alert(data.msg);
+				$("#inputForm").find("button:submit").button("reset");
+			}
+		});
+
+		$('#acceptDate').datetimepicker({
+			format: "YYYY-MM-DD HH:mm:ss"
+		});
+
+		$('#examineDate').datetimepicker({
+			format: "YYYY-MM-DD HH:mm:ss"
+		});
+
+		//富文本初始化
+		$('#reason').summernote({
+			height: 300,
+			lang: 'zh-CN',
+			callbacks: {
+				onChange: function(contents, $editable) {
+					$("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+				}
+			}
+		});
+	})
+
+</script>

src/main/webapp/webpage/modules/sg/fund/fundStart.jsp

@@ -0,0 +1,77 @@
+<%@ page pageEncoding="UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>转资模块</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <%@include file="fundStart.js" %>
+</head>
+<body>
+
+<div class="wrapper wrapper-content">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <h3 class="panel-title">
+                        <a class="panelButton" href="#" onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+                    </h3>
+                </div>
+                <div class="panel-body">
+                    <form:form id="inputForm" modelAttribute="fund" action="${ctx}/fund/save" method="post"
+                               class="form-horizontal" enctype="multipart/form-data">
+                        <form:hidden path="id"/>
+                        <form:hidden path="act.taskId"/>
+                        <form:hidden path="act.taskName"/>
+                        <form:hidden path="act.taskDefKey"/>
+                        <form:hidden path="act.procInsId"/>
+                        <form:hidden path="act.procDefId"/>
+                        <form:hidden id="flag" path="act.flag"/>
+                        <div class="form-group text-center">
+                            <h3> 转资模块项目选择</h3>
+                        </div>
+                        <table class="table table-bordered">
+                            <tbody>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"><font
+                                        color="red">*</font>项目名称：</label></td>
+                                <td class="width-35">
+                                    <sys:itemselect url="${ctx}/sg/managementcenter/project/fundData"
+                                                    id="projectId" name="projectId"
+                                                    value="${project.projectId}"
+                                                    labelName="project.reserveProjectName"
+                                                    labelValue="${project.reserveProjectName}"
+                                                    title="选择项目号" cssClass="form-control"
+                                                    fieldLabels="${fns:urlEncode('项目需求名称|项目定义号|项目名称')}"
+                                                    fieldKeys="reserveProjectName|projectId|projectName"
+                                                    searchLabels="${fns:urlEncode('储备项目名称')}|${fns:urlEncode('项目定义号')}|${fns:urlEncode('项目名称')}"
+                                                    searchKeys="reserveProjectName|projectId|projectName"
+                                                    isMultiSelected="false">
+                                    </sys:itemselect>
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <div class="form-group">
+                            <div class="col-lg-3"></div>
+                            <div class="col-lg-6">
+                                <div class="form-group text-center">
+                                    <div>
+                                        <button class="btn btn-primary btn-block btn-lg btn-parsley" data-loading-text="正在提交...">提 交</button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form:form>
+                    <c:if test="${not empty fund.id}">
+                        <act:flowChart procInsId="${fund.act.procInsId}"/>
+                        <act:histoicFlow procInsId="${fund.act.procInsId}"/>
+                    </c:if>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/fund/wbsForm.js

@@ -0,0 +1,71 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+	<script>
+    /**
+     * 项目经理组织交底页面
+     * */
+    $(document).ready(function () {
+        jp.ajaxForm("#inputForm", function (data) {
+            if (data.success) {
+                jp.success(data.msg);
+                jp.go("${ctx}/managementcenter/divide");
+            } else {
+                jp.error(data.msg);
+                $("#inputForm").find("button:submit").button("reset");
+            }
+        });
+
+        $("#agree").click(function () {
+            var wbsEncoding = $("#wbsEncoding").val();
+            if (''==wbsEncoding) {
+                jp.error('请填写项目的wbs编码');
+            }
+            jp.prompt(" 审批意见", function (message) {
+                jp.post("${ctx}/fund/wbsTask",
+                    {
+                        "taskId": "${fund.act.taskId}",
+                        "taskName": "${fund.act.taskName}",
+                        "taskDefKey": "${fund.act.taskDefKey}",
+                        "procInsId": "${fund.act.procInsId}",
+                        "procDefId": "${fund.act.procDefId}",
+                        "flag":"yes",
+                        "wbsEncoding":wbsEncoding,
+                        "comment": window.encodeURI(message)
+                    },
+                    function (data) {
+                        if (data.success) {
+                            jp.success(data.msg);
+                            jp.go("${ctx}/act/task/todo");
+                        } else {
+                            jp.error(data.msg);
+                        }
+                    })
+            });
+        });
+
+
+        $('#startTime').datetimepicker({
+            format: "YYYY-MM-DD HH:mm:ss"
+        });
+        $('#endTime').datetimepicker({
+            format: "YYYY-MM-DD HH:mm:ss"
+        });
+        //富文本初始化
+        $('#reason').summernote({
+            height: 300,
+            lang: 'zh-CN',
+            readonly: true,
+            callbacks: {
+                onChange: function (contents, $editable) {
+                    $("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+                }
+            }
+        });
+
+
+    })
+
+    //刷新列表
+    function refresh(){
+        location.reload();
+    }
+</script>

src/main/webapp/webpage/modules/sg/fund/wbsForm.jsp

@@ -0,0 +1,172 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>项目经理交底页面</title>
+    <meta name="decorator" content="ani"/>
+    <!-- SUMMERNOTE -->
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <%@include file="wbsForm.js" %>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <h3 class="panel-title">
+                        <h3 class="panel-title">配网项目经理填写wbs编码</h3>
+                    </h3>
+                </div>
+                <div class="panel-body">
+                    <form:form id="inputForm" modelAttribute="fund" action="${ctx}/fund/updateWbs"
+                               method="post" class="form-horizontal">
+                        <form:hidden path="id"/>
+                        <form:hidden path="act.taskId"/>
+                        <form:hidden path="act.taskName"/>
+                        <form:hidden path="act.taskDefKey"/>
+                        <form:hidden path="act.procInsId"/>
+                        <form:hidden path="act.procDefId"/>
+                        <form:hidden id="flag" path="act.flag"/>
+                        <table class="table table-bordered">
+                            <tbody>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">储备项目暂定名称：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.reserveProjectName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">wbs编码：</label></td>
+                                <td class="width-35">
+                                    <form:input id="wbsEncoding" path="wbsEncoding"
+                                                cssClass="form-control required" placeholder="必填"/>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">资产卡片号：</label></td>
+                                <td class="width-35">
+                                    <form:input id="assetCardNumber" path="assetCardNumber" readonly="true"
+                                                cssClass="form-control required" placeholder="必填"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.projectId)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.projectName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">市公司：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.municipalCompany)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 县公司：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.countyCompany)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目性质：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.projectNature)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 需求单位：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.demandUnit)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">运维单位：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.operationUnit)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 供电区域：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.powerSupplyArea)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">网格编号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.gridNumber)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 单元格编号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.cellNumber)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目储备编号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.projectReserveNo)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">电网项目编号</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.gridProjectNo)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> ERP编号</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.erpNo)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">建设必要性及内容：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.necessityContent)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 变电站名称：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.subStationName)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">线路名称：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.lineName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目类型：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.projectType)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否迎峰度夏项目：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.whetherSummer)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 项目基本说明：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.basicDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">工区备注：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.workAreaRemarks)}
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </form:form>
+                    <div class="row">
+                        <div class="col-sm-3"></div>
+                        <div class="col-sm-6">
+                            <div class="form-group text-center">
+                                <input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="提交"/>&nbsp;
+                            </div>
+                        </div>
+                    </div>
+                    <c:if test="${not empty fund.id}">
+                        <act:flowChart procInsId="${fund.act.procInsId}"/>
+                        <act:histoicFlow procInsId="${fund.act.procInsId}"/>
+                    </c:if>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/settactivi/activiti/returnDoc.js

@@ -100,10 +100,10 @@
 					}
 
 				},{
-					field: 'project.requireName',
+					field: 'requireName',
 					title: '项目需求名称',
 				},{
-					field: 'project.projectId',
+					field: 'projectId',
 					title: '流程定义号',
 				},
 				{
@@ -111,7 +111,7 @@
 					title: '文件用途',
 				},
 				{
-					field: 'uId',
+					field: 'uid',
 					title: '上传人员',
 				}
 			]

src/main/webapp/webpage/modules/sg/settactivi/activiti/settActiviStart.jsp

@@ -2,9 +2,8 @@
 <%@ include file="/webpage/include/taglib.jsp" %>
 <html>
 <head>
-    <title>领料提交申请</title>
+    <title>结算项目选择</title>
     <meta name="decorator" content="ani"/>
-    <!-- SUMMERNOTE -->
     <%@include file="/webpage/include/summernote.jsp" %>
     <%@include file="settActiviStart.js" %>
     <script>
@@ -34,7 +33,7 @@
                         <form:hidden path="act.procDefId"/>
                         <form:hidden id="flag" path="act.flag"/>
                         <div class="form-group text-center">
-                            <h3> 领料申请</h3>
+                            <h3> 结算项目选择</h3>
                         </div>
                         <table class="table table-bordered">
                             <tbody>
@@ -42,23 +41,26 @@
                                 <td class="width-15 active"><label class="pull-right"><font
                                         color="red">*</font>项目名称：</label></td>
                                 <td class="width-35">
-                                    <sys:itemselect url="${ctx}/sg/managementcenter/project/settData" id="project"
-                                                    name="projectId" value="${projectId}"
-                                                    labelName="project.requireName" labelValue="${projectName}"
-                                                    title="选择项目号" cssClass="form-control "
-                                                    fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}"
-                                                    fieldKeys="requireName|projecId|projectName|projectNumber"
-                                                    searchLabels="${fns:urlEncode('项目需求名称')}" searchKeys="requireName"
-                                                    isMultiSelected="true">
+                                    <sys:itemselect url="${ctx}/sg/managementcenter/project/settData"
+                                                    id="projectId" name="projectId"
+                                                    value="${project.projectId}"
+                                                    labelName="project.reserveProjectName"
+                                                    labelValue="${project.reserveProjectName}"
+                                                    title="选择项目号" cssClass="form-control"
+                                                    fieldLabels="${fns:urlEncode('项目需求名称|项目定义号|项目名称')}"
+                                                    fieldKeys="reserveProjectName|projectId|projectName"
+                                                    searchLabels="${fns:urlEncode('储备项目名称')}|${fns:urlEncode('项目定义号')}|${fns:urlEncode('项目名称')}"
+                                                    searchKeys="reserveProjectName|projectId|projectName"
+                                                    isMultiSelected="false">
                                     </sys:itemselect>
                                 </td>
                             </tr>
-                            <tr>
+                          <%--  <tr>
                                 <td class="width-15 active"><label class="pull-right"><font color="red">*</font>导入文件：</label></td>
                                 <td class="width-35">
 									<input id="file" name="file"   type="file"  class="form-control" style="margin: 0 auto" />
                                 </td>
-                            </tr>
+                            </tr>--%>
                             </tbody>
                         </table>
 

src/main/webapp/webpage/modules/sg/settactivi/activiti/useQuantity.js

@@ -131,7 +131,7 @@
 						"taskId":"${settActivi.act.taskId}",
 						"taskName":"${settActivi.act.taskName}",
 						"taskDefKey":"${settActivi.act.taskDefKey}",
-						"procInsId": procInsId,
+						"procInsId": "${settActivi.act.procInsId}",
 						"procDefId":"${settActivi.act.procDefId}",
 						"flag":"yes",
 						"comment":window.encodeURI(message)
@@ -152,6 +152,36 @@
 			 jp.downloadFile('${ctx}/settActivi/exportExcel?procInsId='+procInsId);
 		});
 
+		$("#importLedger").click(function () {
+			jp.open({
+				type: 2,
+				area: [500, 200],
+				auto: true,
+				title:"导入原因类型",
+				content: "${ctx}/tag/importExcel" ,
+				btn: ['确定', '关闭'],
+				btn1: function(index, layero){
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var reserveProjectName = "${settActivi.reserveProjectName}";
+					var procInsId = "${settActivi.procInsId}";
+					iframeWin.contentWindow.importExcel('${ctx}/settActivi/importLedger?reserveProjectName='+reserveProjectName+'&procInsId='+procInsId, function (data) {
+						if(data.success){
+							jp.alert(data.msg);
+							refresh();
+						}else{
+							jp.alert(data.msg);
+						}
+						jp.close(index);
+					});//调用保存事件
+					refresh();
+					return false;
+				},
+				btn2: function(index){
+					jp.close(index);
+				}
+			})
+		})
+
 		$('#acceptDate').datetimepicker({
 			format: "YYYY-MM-DD HH:mm:ss"
 		});
@@ -171,4 +201,7 @@
 		});
 	})
 
+	function refresh(){
+		$('#settTable').bootstrapTable('refresh');
+	}
 </script>

src/main/webapp/webpage/modules/sg/settactivi/activiti/useQuantity.jsp

@@ -41,13 +41,16 @@
                         <form:hidden path="act.procDefId"/>
                         <input type="hidden" id="procInsId" name="procInsId" value="${settActivi.act.procInsId}"/>
                         <div class="form-group text-center">
-                            <h3> 填写现场使用数量</h3>
+                            <h3> 填写现场使用数量(${settActivi.reserveProjectName})</h3>
                         </div>
 
                         <div id="">
                             <button id="printf" class="btn btn-info">
                                 <i class="fa fa-folder-open-o"></i> 导出
                             </button>
+                            <button id="importLedger" class="btn btn-info">
+                                <i class="fa fa-folder-open-o"></i> 导入明细账
+                            </button>
                         </div>
 
                         <!-- 表格 -->