diff --git a/erp/src/main/resources/template/js/erpstatistics/incomingstatistics.js b/erp/src/main/resources/template/js/erpstatistics/incomingstatistics.js index 51aa97fce0aa0feb1b77bb153ce4cdc518160493..e966be5b7d50bd7a575d7759f444f8b27f034d70 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 71ee1e4d639e3b122ff8e40831278a8017f6481e..0106f3eab40bf89bd2940a2a42fce4b1707fb128 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 215f9b4d1f87935786df9512547212c8b05d9e4c..216db408273d030a7c680dbf409e1a872d5fa4cb 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 6f04961a824049a668cde472853c9ae5ab10b14a..eb8e7cb07fe29c13ba776430b39e769c3a2ff4ec 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 8b5749c29b769a7928dab8a84281b9a43dc4b973..0ca25e4ba4b70e923b5c7a482b6e8525b83efe2b 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 @@