Browse Source

[feat]bom物料信息。物料类型显示,审核,修改时物料类型显示

dev
zhangsiqi 7 months ago
parent
commit
482017fdfe
  1. 8
      ruoyi-admin/src/main/resources/templates/erp/bom/edit.html
  2. 5
      ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html
  3. 16
      ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html
  4. 2
      ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html
  5. 2
      ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html

8
ruoyi-admin/src/main/resources/templates/erp/bom/edit.html

@ -2,8 +2,8 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改bom')" />
<th:block th:include="include :: select2-css" />
<th:block th:include="include :: bootstrap-editable-css" />
<th:block th:include="include :: select2-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -119,9 +119,6 @@
}
function submitHandler() {
if ($.validate.form()) {
$("#selectMaterialType").removeAttr("disabled");
$("#selectProcessMethod").removeAttr("disabled");
$("#selectUnit").removeAttr("disabled");
$("#selectEngineer").removeAttr("disabled");
var formData = $("#form-bom-edit").serializeArray();
console.log("formData",formData);
@ -133,9 +130,6 @@
}else{
for(var i=0;i<tableData.length;i++){
if(tableData[i].useNum == null || tableData[i].useNum == ''){
$("#selectMaterialType").attr("disabled","disabled");
$("#selectProcessMethod").attr("disabled","disabled");
$("#selectUnit").attr("disabled","disabled");
$.modal.alertWarning("子表数据用量不能为空!");
return;
}

5
ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html

@ -159,7 +159,7 @@
// 控制下拉框选中
var materialType = $("#materialType").val();
$("#selectMaterialType").val(materialType).trigger("change");
$("#selectMaterialType").val(materialType);
var that = this;
// 页面渲染完成,可以执行需要的操作
@ -251,9 +251,6 @@
function submitHandler() {
if ($.validate.form()) {
$("#selectMaterialType").removeAttr("disabled");
$("#selectProcessMethod").removeAttr("disabled");
$("#selectUnit").removeAttr("disabled");
var materialType = $('#selectMaterialType').select2('val');
$('#materialType').val(materialType);
if ($('textarea[name="comment"]').val()) {

16
ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html

@ -56,7 +56,8 @@
<option value="">请选择</option>
</optgroup>
<optgroup th:each="child: ${childList}" th:label="${child.name}">
<option th:each="childSon: ${child.children}" th:value="${childSon.code}" th:text="${#strings.concat(child.name,'-',childSon.name)}"></option>
<option th:each="childSon: ${child.children}"
th:value="${childSon.code}" th:text="${#strings.concat(child.name,'-',childSon.name)}"></option>
</optgroup>
</select>
</div>
@ -137,8 +138,8 @@
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: select2-js" />
<th:block th:include="include :: bootstrap-table-editable-js" />
<th:block th:include="include :: select2-js" />
<script th:src="@{/js/activiti.js}"></script>
<script th:src="@{/ajax/libs/vue/vue.js}"></script>
<script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
@ -157,11 +158,7 @@
}
},
mounted() {
// 控制下拉框选中
var materialType = $("#materialType").val();
$("#selectMaterialType").val(materialType).trigger("change");
var that = this;
// 页面渲染完成,可以执行需要的操作
console.log('页面已渲染完成');
@ -246,14 +243,13 @@
}
},
}
})
});
var prefix = ctx + "erp/bom";
$("#form-edit").validate({focusCleanup: true});
var materialType = $("#materialType").val();
$("#selectMaterialType").val(materialType);
function submitHandler() {
if ($.validate.form()) {
$("#selectMaterialType").removeAttr("disabled");
$("#selectProcessMethod").removeAttr("disabled");
$("#selectUnit").removeAttr("disabled");
var materialType = $('#selectMaterialType').select2('val');
$('#materialType').val(materialType);
if ($('textarea[name="comment"]').val()) {

2
ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html

@ -151,7 +151,7 @@
// 控制下拉框选中
var materialType = $("#materialType").val();
$("#selectMaterialType").val(materialType).trigger("change");
$("#selectMaterialType").val(materialType);
var that = this;
// 页面渲染完成,可以执行需要的操作

2
ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html

@ -158,7 +158,7 @@
// 控制下拉框选中
var materialType = $("#materialType").val();
$("#selectMaterialType").val(materialType).trigger("change");
$("#selectMaterialType").val(materialType);
var that = this;
// 页面渲染完成,可以执行需要的操作

Loading…
Cancel
Save