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

[update]修复bom审核功能，添加获取工程员功能

dev
zhangsiqi 7 months ago
parent
0950e15656
commit
d1b68f8121
5 changed files with 132 additions and 44 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. 38
      ruoyi-admin/src/main/resources/templates/erp/bom/add.html
  2. 29
      ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html
  3. 33
      ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html
  4. 43
      ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html
  5. 33
      ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html

38
ruoyi-admin/src/main/resources/templates/erp/bom/add.html
View File

@ -76,7 +76,9 @@
<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-8">
<input type="text" name="createBy" class="form-control" readonly /> <select name="businessMembers" class="form-control">
<option value="">请选择</option>
</select>
</div> </div>
</div> </div>
</form> </form>
@ -318,11 +320,21 @@
}] }]
}; };
$.table.init(options); $.table.init(options);
/**function optFormatter(value, row, index) { $.ajax({
var actions = []; url: ctx + 'erp/material/getEngineerList',
actions.push('<a class="btn btn-search btn-xs optRow" href="javascript:void(0)"><i class="fa fa-search"></i>选择</a> '); type: 'get',
return actions.join(''); success: function (res) {
}*/ if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
$("select[name='businessMembers']").append(
"<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
}
} else {
$.modal.msgError(res.msg);
}
}
});
}); });
function materilalSelect(data) { function materilalSelect(data) {
var materialType1 = data.materialType.indexOf('yl'); var materialType1 = data.materialType.indexOf('yl');
@ -338,20 +350,6 @@
$("#selectProcessMethod").val([data.processMethod]).trigger("change"); $("#selectProcessMethod").val([data.processMethod]).trigger("change");
$("#selectUnit").val([data.unit]).trigger("change"); $("#selectUnit").val([data.unit]).trigger("change");
} }
/** window.optEvent = {
'click .optRow': function(e, value, row, index) {
console.log("optRow");
console.log(row);
var url = ctx + "erp/material/select";
var options = {
title: '选择料号',
url: url,
uniqueId: row.id,
callBack: doSubmit
};
$.modal.openOptions(options);
},
};*/
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$("#selectMaterialType").removeAttr("disabled"); $("#selectMaterialType").removeAttr("disabled");

29
ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html
View File

@ -10,6 +10,9 @@
<form class="form-horizontal m" id="form-edit" th:object="${formData}"> <form class="form-horizontal m" id="form-edit" th:object="${formData}">
<input name="id" th:field="*{id}" type="hidden"> <input name="id" th:field="*{id}" type="hidden">
<input name="taskId" th:field="*{taskId}" type="hidden"> <input name="taskId" th:field="*{taskId}" type="hidden">
<input name="taskName" th:field="*{taskName}" type="hidden">
<input name="instanceId" th:field="*{instanceId}" type="hidden">
<input name="instanceType" th:field="*{instanceType}" type="hidden">
<input type="hidden" name="p_COM_comment" /> <input type="hidden" name="p_COM_comment" />
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">申请人：</label> <label class="col-sm-3 control-label">申请人：</label>
@ -86,6 +89,14 @@
<textarea name="describe" class="form-control" readonly>[[*{describe}]]</textarea> <textarea name="describe" class="form-control" readonly>[[*{describe}]]</textarea>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">工程员：</label>
<div class="col-sm-8">
<select name="businessMembers" class="form-control">
<option value="">请选择</option>
</select>
</div>
</div>
<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-8">
@ -235,7 +246,23 @@
}, },
} }
}) })
$(function() {
$.ajax({
url: ctx + 'erp/material/getEngineerList',
type: 'get',
success: function (res) {
if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
$("select[name='businessMembers']").append(
"<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
}
} else {
$.modal.msgError(res.msg);
}
}
});
})
var prefix = ctx + "erp/bom"; var prefix = ctx + "erp/bom";
$("#form-edit").validate({ $("#form-edit").validate({
focusCleanup: true focusCleanup: true

33
ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html
View File

@ -10,6 +10,9 @@
<form class="form-horizontal m" id="form-edit" th:object="${formData}"> <form class="form-horizontal m" id="form-edit" th:object="${formData}">
<input name="id" th:field="*{id}" type="hidden"> <input name="id" th:field="*{id}" type="hidden">
<input name="taskId" th:field="*{taskId}" type="hidden"> <input name="taskId" th:field="*{taskId}" type="hidden">
<input name="taskName" th:field="*{taskName}" type="hidden">
<input name="instanceId" th:field="*{instanceId}" type="hidden">
<input name="instanceType" th:field="*{instanceType}" type="hidden">
<input type="hidden" name="p_COM_comment" /> <input type="hidden" name="p_COM_comment" />
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">申请人：</label> <label class="col-sm-3 control-label">申请人：</label>
@ -94,6 +97,14 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">工程员：</label>
<div class="col-sm-8">
<select name="businessMembers" class="form-control">
<option value="">请选择</option>
</select>
</div>
</div>
<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-8">
@ -245,10 +256,24 @@
}) })
var prefix = ctx + "erp/bom"; var prefix = ctx + "erp/bom";
$("#form-edit").validate({ $("#form-edit").validate({focusCleanup: true});
focusCleanup: true $(function() {
}); $.ajax({
url: ctx + 'erp/material/getEngineerList',
type: 'get',
success: function (res) {
if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
$("select[name='businessMembers']").append(
"<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
}
} else {
$.modal.msgError(res.msg);
}
}
});
})
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
var materialType = $('#selectMaterialType').select2('val'); var materialType = $('#selectMaterialType').select2('val');

43
ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html
View File

@ -10,6 +10,9 @@
<form class="form-horizontal m" id="form-edit" th:object="${formData}"> <form class="form-horizontal m" id="form-edit" th:object="${formData}">
<input name="id" th:field="*{id}" type="hidden"> <input name="id" th:field="*{id}" type="hidden">
<input name="taskId" th:field="*{taskId}" type="hidden"> <input name="taskId" th:field="*{taskId}" type="hidden">
<input name="taskName" th:field="*{taskName}" type="hidden">
<input name="instanceId" th:field="*{instanceId}" type="hidden">
<input name="instanceType" th:field="*{instanceType}" type="hidden">
<!--驳回调整允许更新内容--> <!--驳回调整允许更新内容-->
<input type="hidden" name="saveEntity" value="true" /> <input type="hidden" name="saveEntity" value="true" />
<div class="form-group"> <div class="form-group">
@ -87,6 +90,14 @@
<textarea name="describe" class="form-control" >[[*{describe}]]</textarea> <textarea name="describe" class="form-control" >[[*{describe}]]</textarea>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">工程员：</label>
<div class="col-sm-8">
<select name="businessMembers" class="form-control">
<option value="">请选择</option>
</select>
</div>
</div>
<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-8">
@ -237,20 +248,6 @@
isInteger: true, isInteger: true,
minlength: 10, minlength: 10,
maxlength: 10, maxlength: 10,
// remote: {
// url: prefix + "/checkMaterialNoUnique",
// type: "post",
// dataType: "json",
// data: {
// "materialNo": function() {
// console.log($("#materialNo").val())
// return $.common.trim($("#materialNo").val());
// }
// },
// dataFilter: function(data, type) {
// return $.validate.unique(data);
// }
// }
}, },
}, },
messages: { messages: {
@ -262,7 +259,23 @@
}, },
focusCleanup: true focusCleanup: true
}); });
$(function() {
$.ajax({
url: ctx + 'erp/material/getEngineerList',
type: 'get',
success: function (res) {
if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
$("select[name='businessMembers']").append(
"<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
}
} else {
$.modal.msgError(res.msg);
}
}
});
})
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
var materialType = $('#selectMaterialType').select2('val'); var materialType = $('#selectMaterialType').select2('val');

33
ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html
View File

@ -10,6 +10,9 @@
<form class="form-horizontal m" id="form-edit" th:object="${formData}"> <form class="form-horizontal m" id="form-edit" th:object="${formData}">
<input name="id" th:field="*{id}" type="hidden"> <input name="id" th:field="*{id}" type="hidden">
<input name="taskId" th:field="*{taskId}" type="hidden"> <input name="taskId" th:field="*{taskId}" type="hidden">
<input name="taskName" th:field="*{taskName}" type="hidden">
<input name="instanceId" th:field="*{instanceId}" type="hidden">
<input name="instanceType" th:field="*{instanceType}" type="hidden">
<input type="hidden" name="p_COM_comment" /> <input type="hidden" name="p_COM_comment" />
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">申请人：</label> <label class="col-sm-3 control-label">申请人：</label>
@ -86,6 +89,14 @@
<textarea name="describe" class="form-control" readonly>[[*{describe}]]</textarea> <textarea name="describe" class="form-control" readonly>[[*{describe}]]</textarea>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">工程员：</label>
<div class="col-sm-8">
<select name="businessMembers" class="form-control">
<option value="">请选择</option>
</select>
</div>
</div>
<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-8">
@ -237,10 +248,24 @@
}) })
var prefix = ctx + "erp/bom"; var prefix = ctx + "erp/bom";
$("#form-edit").validate({ $("#form-edit").validate({focusCleanup: true});
focusCleanup: true $(function() {
}); $.ajax({
url: ctx + 'erp/material/getEngineerList',
type: 'get',
success: function (res) {
if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
$("select[name='businessMembers']").append(
"<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
}
} else {
$.modal.msgError(res.msg);
}
}
});
})
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
var materialType = $('#selectMaterialType').select2('val'); var materialType = $('#selectMaterialType').select2('val');

Write Preview
Loading…
Cancel
Save