Browse Source

[feat]工程管理:物料信息:编辑验证:设置料号、品名、描述、单位为必填项。

物料类型:辅料-低值易耗品,其他-公司日常需求 选择文本,改为 辅料-非生产用,其他-研发临时物料,新增一个物料类型文本选项: 其他-其他.
dev
zhangsiqi 6 months ago
parent
commit
c01260d7ef
  1. 20
      ruoyi-admin/src/main/resources/templates/erp/material/add.html
  2. 12
      ruoyi-admin/src/main/resources/templates/erp/material/detail.html
  3. 37
      ruoyi-admin/src/main/resources/templates/erp/material/edit.html
  4. 3
      ruoyi-admin/src/main/resources/templates/erp/material/material.html
  5. 25
      ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html
  6. 17
      ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
  7. 33
      ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html
  8. 31
      ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html

20
ruoyi-admin/src/main/resources/templates/erp/material/add.html

@ -9,15 +9,15 @@
<div id="app" class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-material-add">
<div class="form-group">
<label class="col-sm-3 control-label">料号:</label>
<label class="col-sm-3 control-label is-required">料号:</label>
<div class="col-sm-8">
<input id = "materialNo" name="materialNo" class="form-control" type="text">
<input id = "materialNo" name="materialNo" class="form-control" type="text" required />
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料名称:</label>
<div class="col-sm-8">
<input name="materialName" class="form-control" type="text" required>
<input name="materialName" class="form-control" type="text" required />
</div>
</div>
<div class="form-group">
@ -38,7 +38,7 @@
<label class="col-sm-3 control-label is-required">半成品类型:</label>
<div class="col-sm-8">
<select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required>
<option value=""></option>
<option value="">请选择</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
<div id="weiwai" hidden>
@ -60,23 +60,23 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位:</label>
<label class="col-sm-3 control-label is-required">单位:</label>
<div class="col-sm-8">
<select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}">
<select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" required>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">品牌:</label>
<label class="col-sm-3 control-label is-required">品牌:</label>
<div class="col-sm-8">
<input name="brand" class="form-control" type="text">
<input name="brand" class="form-control" type="text" required />
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">描述:</label>
<label class="col-sm-3 control-label is-required">描述:</label>
<div class="col-sm-8">
<textarea name="describe" class="form-control"></textarea>
<textarea name="describe" class="form-control" required></textarea>
</div>
</div>
<div class="form-group">

12
ruoyi-admin/src/main/resources/templates/erp/material/detail.html

@ -10,9 +10,9 @@
<form class="form-horizontal m" id="form-material-detail" th:object="${erpMaterial}">
<input name="id" th:field="*{id}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">料号:</label>
<label class="col-sm-3 control-label is-required">料号:</label>
<div class="col-sm-8">
<input id="materialNo" name="materialNo" th:field="*{materialNo}" class="form-control" type="text" readonly>
<input id="materialNo" name="materialNo" th:field="*{materialNo}" class="form-control" type="text" required readonly />
</div>
</div>
<div class="form-group">
@ -97,19 +97,18 @@
<input id="fileIdStr" readonly type="text" name="fileIdStr" th:field="*{fileIdStr}" hidden>
<input id="removeFileIdStr" readonly type="text" name="removeFileIdStr" hidden>
</div>
</form>
<div class="addressList sh">
<div class="col-sm-12 select-table table-striped">
<div class="details" style="padding: 8px 0;font-size: 18px">技术团队人员信息</div>
<table id="item-table"></table>
</div>
</div>
<div class="addressList sh">
<div class="col-sm-12 select-table table-striped">
<div class="details" style="padding: 8px 0;font-size: 18px">销售价历史</div>
<table id="xiaoshou-table"></table>
</div>
</div>
<div class="addressList sh">
<div class="col-sm-12 select-table table-striped">
@ -122,10 +121,7 @@
<div class="details" style="padding: 8px 0;font-size: 18px">操作历史</div>
<table id="oper-table"></table>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: select2-js" />
@ -255,6 +251,8 @@
})
var prefix = ctx + "erp/material";
$(function(){
var materialType = $("#materialType").val();
$("#selectMaterialType").val(materialType).trigger("change");
var id = $("#id").val();
var materialNo = $("#materialNo").val();
// 技术团队人员信息

37
ruoyi-admin/src/main/resources/templates/erp/material/edit.html

@ -10,15 +10,15 @@
<form class="form-horizontal m" id="form-material-edit" th:object="${erpMaterial}">
<input name="id" th:field="*{id}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">料号:</label>
<label class="col-sm-3 control-label is-required">料号:</label>
<div class="col-sm-8">
<input readonly id="materialNo" name="materialNo" th:field="*{materialNo}" class="form-control" type="text">
<input readonly id="materialNo" name="materialNo" th:field="*{materialNo}" class="form-control" type="text" required />
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料名称:</label>
<div class="col-sm-8">
<input name="materialName" th:field="*{materialName}" class="form-control" type="text">
<input name="materialName" th:field="*{materialName}" class="form-control" type="text" />
</div>
</div>
<div class="form-group">
@ -39,7 +39,7 @@
<label class="col-sm-3 control-label is-required">半成品类型:</label>
<div class="col-sm-8">
<select name="processMethod" class="form-control m-b" th:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required>
<option value=""></option>
<option value="">未选择</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
</select>
</div>
@ -62,22 +62,22 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">品牌:</label>
<label class="col-sm-3 control-label is-required">品牌:</label>
<div class="col-sm-8">
<input name="brand" th:field="*{brand}" class="form-control" type="text">
<input name="brand" th:field="*{brand}" class="form-control" type="text" required/>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">描述:</label>
<label class="col-sm-3 control-label is-required">描述:</label>
<div class="col-sm-8">
<textarea name="describe" class="form-control">[[*{describe}]]</textarea>
<textarea name="describe" class="form-control" required>[[*{describe}]]</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">入库部门:</label>
<div class="col-sm-8">
<select name="warehouseDept" class="form-control m-b" th:field="*{warehouseDept}" th:with="type=${@dict.getType('warehouseDept')}">
<option value=""></option>
<option value="">未选择</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
</select>
</div>
@ -86,7 +86,7 @@
<label class="col-sm-3 control-label">工程员:</label>
<div class="col-sm-8">
<select name="businessMembers" th:field="*{businessMembers}" id="businessMembers_edit" class="form-control m-b" required >
<option value=""> </option>
<option value="">未选择</option>
</select>
</div>
</div>
@ -106,9 +106,9 @@
<div slot="tip" class="el-upload__tip">只能上传jpg/png文件,第一张图片为主图</div>
</el-upload>
</div>
<input id="photoAttachId" name = "photoAttachId" hidden th:field="*{photoAttachId}">
<input id="fileIdStr" type="text" name="fileIdStr" th:field="*{fileIdStr}" hidden>
<input id="removeFileIdStr" type="text" name="removeFileIdStr" hidden>
<input id="photoAttachId" name = "photoAttachId" hidden th:field="*{photoAttachId}" />
<input id="fileIdStr" type="text" name="fileIdStr" th:field="*{fileIdStr}" hidden />
<input id="removeFileIdStr" type="text" name="removeFileIdStr" hidden />
</div>
</form>
</div>
@ -131,11 +131,7 @@
}
},
mounted() {
// 控制下拉框选中
var materialType = $("#materialType").val();
$("#selectMaterialType").val(materialType).trigger("change");
var that = this;
// 页面渲染完成,可以执行需要的操作
console.log('页面已渲染完成');
@ -220,7 +216,7 @@
}
},
}
})
});
var prefix = ctx + "erp/material";
$("#form-material-edit").validate({
onkeyup: false,
@ -255,6 +251,8 @@
focusCleanup: true
});
$(function(){
var materialType = $("#materialType").val();
$("#selectMaterialType").val(materialType).trigger("change");
$.ajax({
url: ctx + 'erp/material/getEngineerList',
type: 'get',
@ -271,7 +269,8 @@
}
});
})
var materialType = $("#materialType").val();
$("#selectMaterialType").val(materialType).trigger("change");
function submitHandler() {
if ($.validate.form()) {
var materialType = $('#selectMaterialType').select2('val');

3
ruoyi-admin/src/main/resources/templates/erp/material/material.html

@ -167,9 +167,12 @@
cancelUrl: prefix + "/cancel/{id}",
restoreUrl: prefix + "/restore/{id}",
detailUrl: prefix + "/detail/{id}",
pageList: [5, 10, 25, 50],
pageSize: 5,
modalName: "物料信息",
fixedColumns: true, // 启用冻结列
fixedRightNumber: 1, // 冻结右列个数
height: $(window).height() - 100,
columns: [
{checkbox: true},
{title: '主键ID',field: 'id',visible: false},

25
ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html

@ -36,9 +36,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">料号:</label>
<label class="col-sm-3 control-label is-required">料号:</label>
<div class="col-sm-8">
<input id="materialNo" name="materialNo" th:field="*{materialNo}" class="form-control" type="text" readonly>
<input id="materialNo" name="materialNo" th:field="*{materialNo}" class="form-control" type="text" required readonly>
</div>
</div>
<div class="form-group">
@ -47,7 +47,7 @@
<input name="materialName" th:field="*{materialName}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<!-- <div class="form-group">
<label class="col-sm-3 control-label">是否有生产团队:</label>
<div class="col-sm-8">
<select name="haveProductTem" class="form-control m-b" th:with="type=${@dict.getType('havaProductTem')}" disabled>
@ -72,7 +72,7 @@
<option th:each="product:${productList}" th:value="${product.productItem}" th:text="${product.productItem}"></option>
</select>
</div>
</div>
</div> -->
<div class="form-group">
<label class="col-sm-3 control-label">物料类型:</label>
<div class="col-sm-8">
@ -88,31 +88,32 @@
<input type="text" id="materialType" name="materialType" th:field="*{materialType}" readonly hidden />
</div>
<div class="form-group">
<label class="col-sm-3 control-label">半成品类型:</label>
<label class="col-sm-3 control-label is-required">半成品类型:</label>
<div class="col-sm-8">
<select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled>
<select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required disabled>
<option value="">请选择</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位:</label>
<label class="col-sm-3 control-label is-required">单位:</label>
<div class="col-sm-8">
<select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" disabled>
<select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" required disabled>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{unit}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">品牌:</label>
<label class="col-sm-3 control-label is-required">品牌:</label>
<div class="col-sm-8">
<input name="brand" th:field="*{brand}" class="form-control" type="text" readonly>
<input name="brand" th:field="*{brand}" class="form-control" type="text" required readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">描述:</label>
<label class="col-sm-3 control-label is-required">描述:</label>
<div class="col-sm-8">
<textarea name="describe" class="form-control" readonly>[[*{describe}]]</textarea>
<textarea name="describe" class="form-control" readonly required>[[*{describe}]]</textarea>
</div>
</div>
<div class="form-group">

17
ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html

@ -36,9 +36,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">料号:</label>
<label class="col-sm-3 control-label is-required">料号:</label>
<div class="col-sm-8">
<input id="materialNo" name="materialNo" th:field="*{materialNo}" class="form-control" type="text" readonly>
<input id="materialNo" name="materialNo" th:field="*{materialNo}" class="form-control" type="text" required readonly>
</div>
</div>
<div class="form-group">
@ -47,7 +47,7 @@
<input name="materialName" th:field="*{materialName}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<!-- <div class="form-group">
<label class="col-sm-3 control-label">是否有生产团队:</label>
<div class="col-sm-8">
<select name="haveProductTem" class="form-control m-b" th:with="type=${@dict.getType('havaProductTem')}" disabled>
@ -72,7 +72,7 @@
<option th:each="product:${productList}" th:value="${product.technicalTeamName}" th:text="${product.technicalTeamName}"></option>
</select>
</div>
</div>
</div> -->
<div class="form-group">
<label class="col-sm-3 control-label">物料类型:</label>
<div class="col-sm-8">
@ -88,9 +88,10 @@
<input type="text" id="materialType" name="materialType" th:field="*{materialType}" readonly hidden />
</div>
<div class="form-group">
<label class="col-sm-3 control-label">半成品类型:</label>
<label class="col-sm-3 control-label is-required">半成品类型:</label>
<div class="col-sm-8">
<select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled>
<select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required disabled>
<option value="">请选择</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>
</select>
</div>
@ -104,9 +105,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">品牌:</label>
<label class="col-sm-3 control-label is-required">品牌:</label>
<div class="col-sm-8">
<input name="brand" th:field="*{brand}" class="form-control" type="text" readonly>
<input name="brand" th:field="*{brand}" class="form-control" type="text" required readonly>
</div>
</div>
<div class="form-group">

33
ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html

@ -37,18 +37,18 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">料号:</label>
<label class="col-sm-3 control-label is-required">料号:</label>
<div class="col-sm-8">
<input id="materialNo" name="materialNo" th:field="*{materialNo}" class="form-control" type="text" >
<input id="materialNo" name="materialNo" th:field="*{materialNo}" class="form-control" type="text" readonly required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料名称:</label>
<label class="col-sm-3 control-label is-required">物料名称:</label>
<div class="col-sm-8">
<input name="materialName" th:field="*{materialName}" class="form-control" type="text" >
<input name="materialName" th:field="*{materialName}" class="form-control" type="text" required />
</div>
</div>
<div class="form-group">
<!--<div class="form-group">
<label class="col-sm-3 control-label">是否有生产团队:</label>
<div class="col-sm-8">
<select name="haveProductTem" class="form-control m-b" th:with="type=${@dict.getType('havaProductTem')}" >
@ -73,11 +73,11 @@
<option th:each="product:${productList}" th:value="${product.technicalTeamName}" th:text="${product.technicalTeamName}"></option>
</select>
</div>
</div>
</div> -->
<div class="form-group">
<label class="col-sm-3 control-label">物料类型:</label>
<label class="col-sm-3 control-label is-required">物料类型:</label>
<div class="col-sm-8">
<select id="selectMaterialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}" >
<select id="selectMaterialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}" required>
<optgroup>
<option value="">请选择</option>
</optgroup>
@ -89,31 +89,32 @@
<input type="text" id="materialType" name="materialType" th:field="*{materialType}" hidden />
</div>
<div class="form-group">
<label class="col-sm-3 control-label">半成品类型:</label>
<label class="col-sm-3 control-label is-required">半成品类型:</label>
<div class="col-sm-8">
<select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" >
<select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required>
<option value="">请选择</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位:</label>
<label class="col-sm-3 control-label is-required">单位:</label>
<div class="col-sm-8">
<select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" >
<select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" required>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{unit}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">品牌:</label>
<label class="col-sm-3 control-label is-required">品牌:</label>
<div class="col-sm-8">
<input name="brand" th:field="*{brand}" class="form-control" type="text" >
<input name="brand" th:field="*{brand}" class="form-control" type="text" required />
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">描述:</label>
<label class="col-sm-3 control-label is-required">描述:</label>
<div class="col-sm-8">
<textarea name="describe" class="form-control" >[[*{describe}]]</textarea>
<textarea name="describe" class="form-control" required>[[*{describe}]]</textarea>
</div>
</div>
<div class="form-group">

31
ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html

@ -36,18 +36,18 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">料号:</label>
<label class="col-sm-3 control-label is-required">料号:</label>
<div class="col-sm-8">
<input id="materialNo" name="materialNo" th:field="*{materialNo}" class="form-control" type="text" readonly>
<input id="materialNo" name="materialNo" th:field="*{materialNo}" class="form-control" type="text" readonly required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料名称:</label>
<label class="col-sm-3 control-label is-required">物料名称:</label>
<div class="col-sm-8">
<input name="materialName" th:field="*{materialName}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<!--<div class="form-group">
<label class="col-sm-3 control-label">是否有生产团队:</label>
<div class="col-sm-8">
<select name="haveProductTem" class="form-control m-b" th:with="type=${@dict.getType('havaProductTem')}" disabled>
@ -72,11 +72,11 @@
<option th:each="product:${productList}" th:value="${product.technicalTeamName}" th:text="${product.technicalTeamName}"></option>
</select>
</div>
</div>
</div> -->
<div class="form-group">
<label class="col-sm-3 control-label">物料类型:</label>
<label class="col-sm-3 control-label is-required">物料类型:</label>
<div class="col-sm-8">
<select id="selectMaterialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}" disabled>
<select id="selectMaterialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}" required disabled>
<optgroup>
<option value="">请选择</option>
</optgroup>
@ -88,31 +88,32 @@
<input type="text" id="materialType" name="materialType" th:field="*{materialType}" readonly hidden />
</div>
<div class="form-group">
<label class="col-sm-3 control-label">半成品类型:</label>
<label class="col-sm-3 control-label is-required">半成品类型:</label>
<div class="col-sm-8">
<select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled>
<select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled required>
<option value="">请选择</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位:</label>
<label class="col-sm-3 control-label is-required">单位:</label>
<div class="col-sm-8">
<select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" disabled>
<select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" disabled required>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{unit}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">品牌:</label>
<label class="col-sm-3 control-label is-required">品牌:</label>
<div class="col-sm-8">
<input name="brand" th:field="*{brand}" class="form-control" type="text" readonly>
<input name="brand" th:field="*{brand}" class="form-control" type="text" required readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">描述:</label>
<label class="col-sm-3 control-label is-required">描述:</label>
<div class="col-sm-8">
<textarea name="describe" class="form-control" readonly>[[*{describe}]]</textarea>
<textarea name="describe" class="form-control" readonly required>[[*{describe}]]</textarea>
</div>
</div>
<div class="form-group">

Loading…
Cancel
Save