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

[feat] 修改该开发修改添加页面，新增查询生产单物料方法，新增查询生产物料bom信息查询方法，新增开发修改单子表信息，新增bom查询父级及相关部门根据materialNo查询bom信息。开发修改单调整页面样式。

dev
zhangsiqi 5 months ago
parent
8734a3c492
commit
0f550540ef
6 changed files with 48 additions and 45 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. 29
      ruoyi-admin/src/main/resources/templates/erp/material/add.html
  2. 15
      ruoyi-admin/src/main/resources/templates/erp/material/edit.html
  3. 12
      ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html
  4. 12
      ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
  5. 13
      ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html
  6. 12
      ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html

29
ruoyi-admin/src/main/resources/templates/erp/material/add.html
View File

@ -69,7 +69,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">入库部门：</label>
<div class="col-sm-8">
<select name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" required>
<select id="selectWarehouseDept" name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" required>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
@ -77,7 +77,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">工程员：</label>
<div class="col-sm-8">
<input name="businessMembers" id="businessMembers_add" class="form-control m-b" disabled required />
<input name="businessMembers" id="businessMembers_add" class="form-control m-b" readonly required />
</div>
</div>
<div class="form-group">
@ -164,27 +164,10 @@
//获取工程员
$(function(){
$("#businessMembers_add").val(loginName);
$("#businessMembers_add").text(userName);
supplierName();
engineer();
$("#add-weiwai").hide();
})
//获取供应商
function supplierName(){
$.ajax({
url: ctx + 'system/supplier/getSupplier',
type: 'post',
success: function (res) {
if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
$("#form-material-add select[name='supplierName']").append(
"<option value='" + usertData[i].supplierName + "'>" + usertData[i].supplierName + "</option>");
}
}
}
})
}
function engineer(){
$.ajax({
url: ctx + 'erp/material/getEngineerList',
@ -194,7 +177,7 @@
var usertData = res.rows;
for (let i in usertData) {
$("select[name='businessMembers']").append(
"<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
"<option value='" + usertData[i].loginName + "'>" + usertData[i].userName + "</option>");
}
} else {
$.modal.msgError(res.msg);
@ -255,6 +238,10 @@
function submitHandler() {
if ($.validate.form()) {
$("#selectMaterialType").removeAttr("disabled");
$("#selectProcessMethod").removeAttr("disabled");
$("#selectUnit").removeAttr("disabled");
$("#selectWarehouseDept").removeAttr("disabled");
var materialType = $('#selectMaterialType').select2('val');
$('#materialType').val(materialType);
$.operate.save(prefix + "/add", $('#form-material-add').serialize());

15
ruoyi-admin/src/main/resources/templates/erp/material/edit.html
View File

@ -35,7 +35,7 @@
<div class="form-group">
<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>
<select name="processMethod" class="form-control m-b" th:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
</select>
</div>
@ -43,7 +43,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">单位：</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')}">
<option value=""></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{unit}"></option>
</select>
@ -64,7 +64,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">入库部门：</label>
<div class="col-sm-8">
<select name="warehouseDept" class="form-control m-b" th:field="*{warehouseDept}" th:with="type=${@dict.getType('warehouseDept')}">
<select name="warehouseDept" class="form-control m-b" th:field="*{warehouseDept}" th:with="type=${@dict.getType('warehouseDept')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
</select>
</div>
@ -72,7 +72,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">工程员：</label>
<div class="col-sm-8">
<select name="businessMembers" id="businessMembers_edit" class="form-control m-b" required >
<select name="businessMembers" id="businessMembers_edit" class="form-control m-b" disabled required >
</select>
</div>
</div>
@ -258,10 +258,10 @@
if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
engineerSelect.append(
"<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
$("#businessMembers_edit").append(
"<option value='" + usertData[i].loginName + "'>" + usertData[i].userName + "</option>");
}
engineerSelect.val(erpMaterial.businessMembers);
$("#businessMembers_edit").val(erpMaterial.businessMembers);
} else {
$.modal.msgError(res.msg);
}
@ -271,6 +271,7 @@
//获取供应商
function submitHandler() {
if ($.validate.form()) {
$("#businessMembers_edit").removeAttr("disabled");
var materialType = $('#selectMaterialType').select2('val');
$('#materialType').val(materialType);
$.operate.save(prefix + "/edit", $('#form-material-edit').serialize());

12
ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html
View File

@ -64,7 +64,7 @@
<div class="form-group">
<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 disabled>
<select id="selectProcessMethod" 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>
@ -73,7 +73,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">单位：</label>
<div class="col-sm-8">
<select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" disabled>
<select id="selectUnit" name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" disabled>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{unit}"></option>
</select>
</div>
@ -93,7 +93,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">入库部门：</label>
<div class="col-sm-8">
<select name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" required disabled>
<select id="selectWarehouseDept" name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" required disabled>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseDept}"></option>
</select>
</div>
@ -101,7 +101,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">工程员：</label>
<div class="col-sm-8">
<input name="businessMembers" th:field="*{businessMembers}" id="businessMembers_edit" class="form-control m-b" required disabled>
<input name="businessMembers" th:field="*{businessMembers}" id="businessMembers_edit" class="form-control m-b" required readonly>
</div>
</div>
<div class="form-group">
@ -259,6 +259,10 @@
$("#form-gcjl-edit").validate({focusCleanup: true});
function submitHandler() {
if ($.validate.form()) {
$("#selectMaterialType").removeAttr("disabled");
$("#selectProcessMethod").removeAttr("disabled");
$("#selectUnit").removeAttr("disabled");
$("#selectWarehouseDept").removeAttr("disabled");
var materialType = $('#selectMaterialType').select2('val');
$('#materialType').val(materialType);
if ($('textarea[name="comment"]').val()) {

12
ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
View File

@ -64,7 +64,7 @@
<div class="form-group">
<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 disabled>
<select id="selectProcessMethod" 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>
@ -73,7 +73,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">单位：</label>
<div class="col-sm-8">
<select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" disabled>
<select id="selectUnit" name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" disabled>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{unit}"></option>
</select>
</div>
@ -93,7 +93,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">入库部门：</label>
<div class="col-sm-8">
<select name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" disabled required>
<select id="selectWarehouseDept" name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" disabled required>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseDept}"></option>
</select>
</div>
@ -101,7 +101,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">工程员：</label>
<div class="col-sm-8">
<input name="businessMembers" th:field="*{businessMembers}" id="businessMembers_edit" class="form-control m-b" required disabled>
<input name="businessMembers" th:field="*{businessMembers}" id="businessMembers_edit" class="form-control m-b" required readonly>
</div>
</div>
<div class="form-group">
@ -258,6 +258,10 @@
$("#form-edit").validate({focusCleanup: true});
function submitHandler() {
if ($.validate.form()) {
$("#selectMaterialType").removeAttr("disabled");
$("#selectProcessMethod").removeAttr("disabled");
$("#selectUnit").removeAttr("disabled");
$("#selectWarehouseDept").removeAttr("disabled");
var materialType = $('#selectMaterialType').select2('val');
$('#materialType').val(materialType);
if ($('textarea[name="comment"]').val()) {

13
ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html
View File

@ -65,7 +65,7 @@
<div class="form-group">
<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>
<select id="selectProcessMethod" 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>
@ -74,7 +74,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">单位：</label>
<div class="col-sm-8">
<select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}">
<select id="selectUnit" name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{unit}"></option>
</select>
</div>
@ -94,7 +94,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">入库部门：</label>
<div class="col-sm-8">
<select name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" required disabled>
<select id="selectWarehouseDept" name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" required disabled>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseDept}"></option>
</select>
</div>
@ -102,8 +102,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">工程员：</label>
<div class="col-sm-8">
<select name="businessMembers" id="businessMembers_edit" class="form-control m-b" required disabled>
</select>
<input name="businessMembers" id="businessMembers_edit" class="form-control m-b" required readonly>
</div>
</div>
<div class="form-group">
@ -269,6 +268,10 @@
});
function submitHandler() {
if ($.validate.form()) {
$("#selectMaterialType").removeAttr("disabled");
$("#selectProcessMethod").removeAttr("disabled");
$("#selectUnit").removeAttr("disabled");
$("#selectWarehouseDept").removeAttr("disabled");
var materialType = $('#selectMaterialType').select2('val');
$('#materialType').val(materialType);
var taskId = [[${taskId}]];

12
ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html
View File

@ -64,7 +64,7 @@
<div class="form-group">
<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 required>
<select id="selectProcessMethod" 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>
@ -73,7 +73,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">单位：</label>
<div class="col-sm-8">
<select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" disabled>
<select id="selectUnit" name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" disabled>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{unit}"></option>
</select>
</div>
@ -93,7 +93,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">入库部门：</label>
<div class="col-sm-8">
<select name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" disabled required>
<select id="selectWarehouseDept" name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" disabled required>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseDept}"></option>
</select>
</div>
@ -101,7 +101,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">工程员：</label>
<div class="col-sm-8">
<input name="businessMembers" th:field="*{businessMembers}" id="businessMembers_edit" class="form-control m-b" required disabled>
<input name="businessMembers" th:field="*{businessMembers}" id="businessMembers_edit" class="form-control m-b" required readonly>
</div>
</div>
<div class="form-group">
@ -258,6 +258,10 @@
$("#form-edit").validate({focusCleanup: true});
function submitHandler() {
if ($.validate.form()) {
$("#selectMaterialType").removeAttr("disabled");
$("#selectProcessMethod").removeAttr("disabled");
$("#selectUnit").removeAttr("disabled");
$("#selectWarehouseDept").removeAttr("disabled");
var materialType = $('#selectMaterialType').select2('val');
$('#materialType').val(materialType);
if ($('textarea[name="comment"]').val()) {

Write Preview
Loading…
Cancel
Save