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

Merge remote-tracking branch 'origin/dev' into dev

dev
zhangsiqi 5 months ago
parent
2d2404fd6f 327c4dfcb3
commit
b6072fcbfd
2 changed files with 9 additions and 10 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. 2
      ruoyi-admin/src/main/resources/templates/erp/material/material.html
  2. 17
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html

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

@ -125,7 +125,7 @@
detailUrl: prefix + "/detail/{id}", detailUrl: prefix + "/detail/{id}",
pageList: [10, 25, 50], pageList: [10, 25, 50],
pageSize: 10, pageSize: 10,
showColumns: false, showColumns: true,
modalName: "物料信息", modalName: "物料信息",
fixedColumns: true, // 启用冻结列 fixedColumns: true, // 启用冻结列
fixedRightNumber: 1, // 冻结右列个数 fixedRightNumber: 1, // 冻结右列个数

17
ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwgzVerify.html → ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
View File

@ -6,7 +6,7 @@
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div id="app" class="wrapper wrapper-content animated fadeInRight ibox-content"> <div id="app" class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-customerQuote-ywgz" th:object="${formData}"> <form class="form-horizontal m" id="form-customerQuote-ywzg" 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="taskName" th:field="*{taskName}" type="hidden">
@ -179,7 +179,7 @@
<script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script> <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "erp/bom"; var prefix = ctx + "erp/bom";
$("#form-customerQuote-ywgz").validate({focusCleanup: true}); $("#form-customerQuote-ywzg").validate({focusCleanup: true});
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var auditStatusDatas = [[${@dict.getType('auditStatus')}]]; var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]]; var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
@ -188,7 +188,7 @@
var sysCustomerQuote = [[${formData}]]; var sysCustomerQuote = [[${formData}]];
var prefix = ctx + "system/customerQuote" var prefix = ctx + "system/customerQuote"
var commonCurrency = $("#commonCurrency_edit option:selected").val(); var commonCurrency = $("#commonCurrency_edit option:selected").val();
$("#form-customerQuote-ywgz").validate({ $("#form-customerQuote-ywzg").validate({
focusCleanup: true, focusCleanup: true,
}); });
$(function() { $(function() {
@ -201,9 +201,9 @@
if (res.rows.length > 0) { if (res.rows.length > 0) {
var usertData = res.rows; var usertData = res.rows;
for (let i in usertData) { for (let i in usertData) {
$("#form-customerQuote-ywgz select[name='businessMembers']").append("<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>"); $("#form-customerQuote-ywzg select[name='businessMembers']").append("<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
} }
$("#form-customerQuote-ywgz select[name='businessMembers']").val(sysCustomerQuote.businessMembers).trigger("change") $("#form-customerQuote-ywzg select[name='businessMembers']").val(sysCustomerQuote.businessMembers).trigger("change")
} else { } else {
$.modal.msgError(res.msg); $.modal.msgError(res.msg);
} }
@ -516,15 +516,14 @@
} }
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
var materialType = $('#selectMaterialType').select2('val');
$('#materialType').val(materialType);
if ($('textarea[name="comment"]').val()) { if ($('textarea[name="comment"]').val()) {
$('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val()); $('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val());
} }
var taskId = [[${taskId}]];
var tableData = $("#bootstrap-table-Quote-child3").bootstrapTable('getData'); var tableData = $("#bootstrap-table-Quote-child3").bootstrapTable('getData');
$("input[name='customerQuoteChildList']").val(JSON.stringify(tableData)); $("input[name='customerQuoteChildList']").val(JSON.stringify(tableData));
var taskId = [[${taskId}]];
$.operate.save(prefix + "/complete/" + taskId, $('#form-customerQuote-ywgz').serialize()); $.operate.save(prefix + "/complete/" + taskId, $('#form-customerQuote-ywzg').serialize());
} }
} }
Write Preview
Loading…
Cancel
Save