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

[fix] 

委外加工 委外计划
修改委外计划列表页面；
修改委外计划详情页面；
dev
王晓迪 4 days ago
parent
fc2adbf45c
commit
c2e0e15d3f
2 changed files with 24 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
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 67
      ruoyi-admin/src/main/resources/templates/system/outsource_plan/detail.html
  2. 14
      ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html

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

@ -80,6 +80,8 @@
$("#form-outsource_plan-edit").validate({
focusCleanup: true
});
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
$(function() {
var options = {
@ -90,45 +92,25 @@
showToggle: false,
showColumns: false,
sidePagination: "client",
columns: [{
checkbox: true
},
{
field: 'index',
align: 'center',
title: "序号",
formatter: function (value, row, index) {
var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
return columnIndex + $.table.serialNumber(index);
}
},
columns: [
{
field: 'materialNo',
align: 'center',
title: '料号',
formatter: function(value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].materialNo' value='%s'>", index, value);
return html;
}
},
{
field: 'materialName',
align: 'center',
title: '物料名称',
formatter: function(value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].materialName' value='%s'>", index, value);
return html;
}
},
{
field: 'materialType',
align: 'center',
title: '物料类型',
formatter: function(value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].materialType' value='%s'>", index, value);
return html;
formatter: function (value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
@ -136,39 +118,28 @@
field: 'materialPhotourl',
align: 'center',
title: '物料图片',
formatter: function(value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].materialPhotourl' value='%s'>", index, value);
return html;
}
},
{
field: 'description',
align: 'center',
title: '描述',
formatter: function(value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].description' value='%s'>", index, value);
return html;
}
},
{
field: 'brand',
align: 'center',
title: '品牌',
formatter: function(value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].brand' value='%s'>", index, value);
return html;
}
},
{
field: 'processMethod',
align: 'center',
title: '加工方式',
formatter: function(value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].processMethod' value='%s'>", index, value);
return html;
formatter: function (value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
}
},
@ -176,40 +147,28 @@
field: 'unit',
align: 'center',
title: '单位',
formatter: function(value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].unit' value='%s'>", index, value);
return html;
}
},
{
field: 'plannedOutsourceAmount',
align: 'center',
title: '计划委外数',
formatter: function(value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].plannedOutsourceAmount' value='%s'>", index, value);
return html;
}
},
{
field: 'outsourceProcessType',
align: 'center',
title: '委外工序种类',
formatter: function(value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].outsourceProcessType' value='%s'>", index, value);
return html;
}
},
{
field: 'outsourceProcessAmount',
align: 'center',
title: '委外工序合计',
formatter: function(value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].outsourceProcessAmount' value='%s'>", index, value);
return html;
}
},]
};
$.table.init(options);

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

@ -24,7 +24,7 @@
</li>
<li>
<label>审核状态：</label>
<select name="auditStatus" th:with="type=${@dict.getType('sys_yes_no')}">
<select name="auditStatus" th:with="type=${@dict.getType('auditStatus')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
@ -59,6 +59,8 @@
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('system:outsource_plan:detail')}]];
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var prefix = ctx + "system/outsource_plan";
@ -172,7 +174,10 @@
},
{
field : 'materialType',
title : '物料类型'
title : '物料类型',
formatter: function (value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
{
field : 'description',
@ -184,7 +189,10 @@
},
{
field : 'processMethod',
title : '加工方式'
title : '加工方式',
formatter: function (value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
}
},
{
field : 'unit',

Write Preview
Loading…
Cancel
Save