root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[fix] 

委外加工 委外计划
修改委外计划列表页面搜索栏字段定义；
修改委外报价mapper列表查询方法；
修改委外计划详情页面显示样式；
dev
王晓迪 1 day ago
parent
491a497189
commit
78cbfd7e35
4 changed files with 56 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java
  2. 5
      ruoyi-admin/src/main/resources/mapper/system/OutsourcePlanMapper.xml
  3. 48
      ruoyi-admin/src/main/resources/templates/system/outsource_plan/detail.html
  4. 28
      ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html

2
ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java
View File

@ -122,7 +122,7 @@ public class OutsourcePlanController extends BaseController
return prefix + "/edit"; return prefix + "/edit";
} }
/** /**
* 修改委外计划 * 委外计划详情
*/ */
@RequiresPermissions("system:outsource_plan:detail") @RequiresPermissions("system:outsource_plan:detail")
@GetMapping("/detail/{outsourcePlanId}") @GetMapping("/detail/{outsourcePlanId}")

5
ruoyi-admin/src/main/resources/mapper/system/OutsourcePlanMapper.xml
View File

@ -48,12 +48,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectOutsourcePlanList" parameterType="OutsourcePlan" resultMap="OutsourcePlanResult"> <select id="selectOutsourcePlanList" parameterType="OutsourcePlan" resultMap="OutsourcePlanResult">
<include refid="selectOutsourcePlanVo"/> <include refid="selectOutsourcePlanVo"/>
<where> <where>
<if test="outsourcePlanCode != null and outsourcePlanCode != ''"> and outsource_plan_code = #{outsourcePlanCode}</if> <if test="outsourcePlanCode != null and outsourcePlanCode != ''"> and outsource_plan_code like concat('%', #{outsourcePlanCode}, '%')</if>
<if test="associateOrderNo != null and associateOrderNo != ''"> and associate_order_no = #{associateOrderNo}</if> <if test="associateOrderNo != null and associateOrderNo != ''"> and associate_order_no like concat('%', #{associateOrderNo}, '%')</if>
<if test="applicant != null and applicant != ''"> and applicant = #{applicant}</if> <if test="applicant != null and applicant != ''"> and applicant = #{applicant}</if>
<if test="status != null and status != ''"> and status = #{status}</if> <if test="status != null and status != ''"> and status = #{status}</if>
<if test="source != null and source != ''"> and source = #{source}</if> <if test="source != null and source != ''"> and source = #{source}</if>
<if test="createTime != null "> and create_time = #{createTime}</if> <if test="createTime != null "> and create_time = #{createTime}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where> </where>
</select> </select>

48
ruoyi-admin/src/main/resources/templates/system/outsource_plan/detail.html
View File

@ -1,70 +1,58 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head> <head>
<th:block th:include="include :: header('修改委外计划')" /> <th:block th:include="include :: header('委外计划详情')" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-outsource_plan-edit" th:object="${outsourcePlan}"> <form class="form-horizontal m" id="form-outsource_plan-edit" th:object="${outsourcePlan}">
<h4 class="form-header h4">委外计划信息</h4>
<input name="outsourcePlanId" th:field="*{outsourcePlanId}" type="hidden"> <input name="outsourcePlanId" th:field="*{outsourcePlanId}" type="hidden">
<div class="col-xs-12">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">委外计划单号：</label> <label class="col-sm-3 control-label is-required">委外计划单号：</label>
<div class="col-sm-8"> <div class="col-sm-6">
<div class="form-control-static" th:text="${outsourcePlan.outsourcePlanCode}"></div> <input type="text" class="form-control" name="outsourcePlanCode" id="outsourcePlanCode" th:field="*{outsourcePlanCode}" readonly>
</div> </div>
</div> </div>
</div>
<div class="col-xs-12">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">关联单号：</label> <label class="col-sm-3 control-label">关联单号：</label>
<div class="col-sm-8"> <div class="col-sm-6">
<div class="form-control-static" th:text="${outsourcePlan.associateOrderNo}"></div> <input type="text" class="form-control" name="associateOrderNo" id="associateOrderNo" th:field="*{associateOrderNo}" readonly>
</div>
</div> </div>
</div> </div>
<div class="col-xs-12">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">申请人：</label> <label class="col-sm-3 control-label">申请人：</label>
<div class="col-sm-8"> <div class="col-sm-6">
<div class="form-control-static" th:text="${outsourcePlan.applicant}"></div> <input type="text" class="form-control" name="applicant" id="applicant" th:field="*{applicant}" readonly>
</div> </div>
</div> </div>
</div>
<div class="col-xs-12">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">物料总计：</label> <label class="col-sm-3 control-label">物料总计：</label>
<div class="col-sm-8"> <div class="col-sm-6">
<div class="form-control-static" th:text="${outsourcePlan.materialAmount}"></div> <input type="text" class="form-control" name="materialAmount" id="materialAmount" th:field="*{materialAmount}" readonly>
</div>
</div> </div>
</div> </div>
<div class="col-xs-12">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">数量总计：</label> <label class="col-sm-3 control-label">数量总计：</label>
<div class="col-sm-8"> <div class="col-sm-6">
<div class="form-control-static" th:text="${outsourcePlan.totalAmount}"></div> <input type="text" class="form-control" name="totalAmount" id="totalAmount" th:field="*{totalAmount}" readonly>
</div> </div>
</div> </div>
</div>
<div class="col-xs-12">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">委外工序合计：</label> <label class="col-sm-3 control-label">委外工序合计：</label>
<div class="col-sm-8"> <div class="col-sm-6">
<div class="form-control-static" th:text="${outsourcePlan.outsourceProcessAmount}"></div> <input type="text" class="form-control" name="outsourceProcessAmount" id="outsourceProcessAmount" th:field="*{outsourceProcessAmount}" readonly>
</div>
</div> </div>
</div> </div>
<div class="col-xs-12">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">来源：</label> <label class="col-sm-3 control-label">来源：</label>
<div class="col-sm-8"> <div class="col-sm-6">
<div class="form-control-static" th:text="${outsourcePlan.source}"></div> <input type="text" class="form-control" name="source" id="source" th:field="*{source}" readonly>
</div> </div>
</div> </div>
<div class="form-group">
</div> </div>
<h4 class="form-header h4">委外计划详情信息</h4> <h4 class="form-header h4" style="height: 30px;">委外计划详情信息</h4>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">

28
ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html
View File

@ -23,20 +23,22 @@
<input type="text" name="applicant"/> <input type="text" name="applicant"/>
</li> </li>
<li> <li>
<label>审核状态：</label> <label>状态：</label>
<select name="auditStatus" th:with="type=${@dict.getType('auditStatus')}"> <select name="status" th:with="type=${@dict.getType('purchase_plan_status')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li>
<label>来源：</label>
<input type="text" name="source"/>
</li>
<li> <li>
<label>录入时间：</label> <label>录入时间：</label>
<input type="text" class="time-input" placeholder="请选择录入时间" name="createTime"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
</li> </li>
<!-- <li>-->
<!-- <label>来源：</label>-->
<!-- <input type="text" name="source"/>-->
<!-- </li>-->
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@ -61,6 +63,8 @@
var detailFlag = [[${@permission.hasPermi('system:outsource_plan:detail')}]]; var detailFlag = [[${@permission.hasPermi('system:outsource_plan:detail')}]];
var processMethodDatas = [[${@dict.getType('processMethod')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var sourceTypeDatas = [[${@dict.getType('purchase_plan_source')}]];
var planStatusDatas = [[${@dict.getType('purchase_plan_status')}]];
var prefix = ctx + "system/outsource_plan"; var prefix = ctx + "system/outsource_plan";
@ -82,7 +86,10 @@
}, },
{ {
field: 'status', field: 'status',
title: '状态' title: '状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(planStatusDatas, value);
}
}, },
{ {
@ -117,7 +124,10 @@
{ {
field: 'source', field: 'source',
title: '来源' title: '来源',
formatter: function(value, row, index) {
return $.table.selectDictLabel(sourceTypeDatas, value);
}
}, },
{ {
field: 'applicant', field: 'applicant',

Write Preview
Loading…
Cancel
Save