From 53710c4d048339bedb3ead4134e77a300686ece2 Mon Sep 17 00:00:00 2001 From: "LAPTOP-UV1MNL38\\18023" <1802330370@qq.com> Date: Sat, 20 Jul 2024 22:10:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/js/erpstatistics/incomingstatistics.js | 6 +++--- .../purchaseQualityInspectionList.js | 4 ++-- .../template/js/purchaseRequest/purchaseRequestList.js | 4 ++-- .../template/js/supplierContract/supplierContractList.js | 4 ++-- .../main/resources/template/tpl/materialCode/batchCopy.html | 2 +- .../main/resources/template/js/member/memberSearchChoose.js | 2 +- .../main/resources/template/js/project/projectChooseList.js | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/erp/src/main/resources/template/js/erpstatistics/incomingstatistics.js b/erp/src/main/resources/template/js/erpstatistics/incomingstatistics.js index 51aa97fce..e966be5b7 100644 --- a/erp/src/main/resources/template/js/erpstatistics/incomingstatistics.js +++ b/erp/src/main/resources/template/js/erpstatistics/incomingstatistics.js @@ -22,9 +22,9 @@ layui.config({ limit: getLimit(), cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'name', title: '产品名称', align: 'left',width: 150, templet: function (d) {return d.materialMation.name}}, - { field: 'model', title: '产品型号', align: 'left',width: 150, templet: function (d) {return d.materialMation.model}}, - { field: 'norms', title: '产品规格', align: 'left',width: 150, templet: function (d) {return d.normsMation.name}}, + { field: 'name', title: '产品名称', align: 'left',width: 150, templet: function (d) {return getNotUndefinedVal(d.materialMation?.name)}}, + { field: 'model', title: '产品型号', align: 'left',width: 150, templet: function (d) {return getNotUndefinedVal(d.materialMation?.model)}}, + { field: 'norms', title: '产品规格', align: 'left',width: 150, templet: function (d) {return getNotUndefinedVal(d.normsMation?.name)}}, { field: 'currentTock', title: '进货数量', align: 'left', width: 100 }, { field: 'currentTockMoney', title: '进货金额', align: 'left', width: 120 }, { field: 'returnCurrentTock', title: '退货数量', align: 'left', width: 100 }, diff --git a/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js b/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js index 71ee1e4d6..0106f3eab 100644 --- a/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js +++ b/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js @@ -135,7 +135,7 @@ layui.config({ approvalId: approvalId }; AjaxPostUtil.request({url: sysMainMation.erpBasePath + "submitQualityInspectionToApproval", params: params, type: 'json', method: 'POST', callback: function (json) { - winui.window.msg("提交成功", {icon: 1, time: 2000}); + winui.window.msg("提交成功。", {icon: 1, time: 2000}); loadTable(); }}); }); @@ -158,7 +158,7 @@ layui.config({ layer.confirm('确认撤销该申请吗?', { icon: 3, title: '撤销操作' }, function (index) { layer.close(index); AjaxPostUtil.request({url: sysMainMation.erpBasePath + "revokeQualityInspection", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) { - winui.window.msg("提交成功", {icon: 1, time: 2000}); + winui.window.msg("撤销成功。", {icon: 1, time: 2000}); loadTable(); }}); }); diff --git a/erp/src/main/resources/template/js/purchaseRequest/purchaseRequestList.js b/erp/src/main/resources/template/js/purchaseRequest/purchaseRequestList.js index 215f9b4d1..216db4082 100644 --- a/erp/src/main/resources/template/js/purchaseRequest/purchaseRequestList.js +++ b/erp/src/main/resources/template/js/purchaseRequest/purchaseRequestList.js @@ -176,7 +176,7 @@ layui.config({ layer.confirm('确认撤销该申请吗?', { icon: 3, title: '撤销操作' }, function (index) { layer.close(index); AjaxPostUtil.request({url: sysMainMation.erpBasePath + "revokePurchaseRequest", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) { - winui.window.msg("提交成功", {icon: 1, time: 2000}); + winui.window.msg("撤销成功。", {icon: 1, time: 2000}); loadTable(); }}); }); @@ -192,7 +192,7 @@ layui.config({ approvalId: approvalId }; AjaxPostUtil.request({url: sysMainMation.erpBasePath + "submitPurchaseRequestToApproval", params: params, type: 'json', method: "POST", callback: function (json) { - winui.window.msg("提交成功", {icon: 1, time: 2000}); + winui.window.msg("提交成功。", {icon: 1, time: 2000}); loadTable(); }}); }); diff --git a/erp/src/main/resources/template/js/supplierContract/supplierContractList.js b/erp/src/main/resources/template/js/supplierContract/supplierContractList.js index 6f04961a8..eb8e7cb07 100644 --- a/erp/src/main/resources/template/js/supplierContract/supplierContractList.js +++ b/erp/src/main/resources/template/js/supplierContract/supplierContractList.js @@ -209,7 +209,7 @@ layui.config({ approvalId: approvalId }; AjaxPostUtil.request({url: sysMainMation.erpBasePath + "mysuppliercontract009", params: params, type: 'json', method: 'POST', callback: function (json) { - winui.window.msg("提交成功", {icon: 1, time: 2000}); + winui.window.msg("提交成功。", {icon: 1, time: 2000}); loadTable(); }}); }); @@ -293,7 +293,7 @@ layui.config({ layer.confirm(msg, { icon: 3, title: '撤销申请提交' }, function (index) { layer.close(index); AjaxPostUtil.request({url: sysMainMation.erpBasePath + "mysuppliercontract016", params: {processInstanceId: data.processInstanceId}, type: 'json', method: 'PUT', callback: function (json) { - winui.window.msg("提交成功", {icon: 1, time: 2000}); + winui.window.msg("撤销成功。", {icon: 1, time: 2000}); loadTable(); }}); }); diff --git a/erp/src/main/resources/template/tpl/materialCode/batchCopy.html b/erp/src/main/resources/template/tpl/materialCode/batchCopy.html index 8b5749c29..0ca25e4ba 100644 --- a/erp/src/main/resources/template/tpl/materialCode/batchCopy.html +++ b/erp/src/main/resources/template/tpl/materialCode/batchCopy.html @@ -36,7 +36,7 @@
- +
diff --git a/member/src/main/resources/template/js/member/memberSearchChoose.js b/member/src/main/resources/template/js/member/memberSearchChoose.js index 729a0a0a9..3dd6e1335 100644 --- a/member/src/main/resources/template/js/member/memberSearchChoose.js +++ b/member/src/main/resources/template/js/member/memberSearchChoose.js @@ -70,7 +70,7 @@ layui.config({ } }) - initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入名称", function () { + initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入联系电话", function () { table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); }); } diff --git a/pro/src/main/resources/template/js/project/projectChooseList.js b/pro/src/main/resources/template/js/project/projectChooseList.js index 14ab823c8..eae0d56eb 100644 --- a/pro/src/main/resources/template/js/project/projectChooseList.js +++ b/pro/src/main/resources/template/js/project/projectChooseList.js @@ -42,7 +42,7 @@ layui.config({ ]], done: function(json) { matchingLanguage(); - initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号,项目名称", function () { + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () { table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); }); -- GitLab