From 67013190d102da9a707a90dd96cd8a19e7617cec Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 15 Oct 2024 14:33:11 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=89=8D=E7=AB=AF=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=A6=81=E6=B1=82=EF=BC=9A=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9ry-ui.js=E7=9A=84dropdownToggle=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=92=8C=E8=A1=A8=E5=A4=B4=E7=9A=84=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95=E7=9A=84=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E7=9A=84=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2=E5=8A=A0=E6=B7=B1?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=EF=BC=8C=E7=A1=AE=E5=AE=9A=E6=9C=80=E7=BB=88?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E4=BD=9C=E4=B8=BA=E7=A4=BA=E4=BE=8B=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E7=9A=84=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84=E6=8E=92=E5=88=97=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/static/ruoyi/js/ry-ui.js | 6 +- .../system/customerQuote/customerQuote.html | 154 ++++++++++-------- 2 files changed, 91 insertions(+), 69 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 04f1778f..796e4289 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -330,12 +330,12 @@ var table = { dropdownToggle: function (value) { var actions = []; actions.push('
'); - actions.push(''); - actions.push('
'); return actions.join(''); diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html index 86c81adc..6b731161 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html @@ -64,27 +64,27 @@
- + 添加 - + 导出 - + 导出Vantritek-RMB - + 导出Vantritek-美元 - + 导出Infinity-RMB - + 导出Infinity-美元
-
+
@@ -133,6 +133,8 @@ fixedColumns:true, showFooter: true, fixedRightNumber:1, + sortable: true, // 是否启用排序 + sortStable: true, // 设置为 true 将获得稳定的排序 columns: [ {checkbox: true}, {field: 'id',title: '主键ID',visible: false}, @@ -143,6 +145,15 @@ {field: 'instanceTypeName',title: '流程实例类型',visible: false}, {field: 'applyUser',title: '申请人ID', visible: false}, + {field: 'taskId', title: '当前任务ID',visible: false}, + {field: 'todoUserId',title: '待办用户ID',visible: false}, + {field: 'taskName',title: '当前任务名称',align: 'center', visible: false, + formatter: function(value, row, index) { return '' + value + ''; } + }, + { title: '审核状态',field: 'auditStatus', visible: false, + formatter: function (value, row, index) { return $.table.selectDictLabel(auditStatusDatas, value);} + }, + {title: '当前状态',field: 'taskStatus',align: 'center', formatter: function(value, row, index) { if(row.auditStatus!="1"&&value != "未启动"){ @@ -154,26 +165,10 @@ return '' + value + '';} }, - {field: 'applyUserName', title: '申请人', - formatter: function(value, row, index) {return '' + (value ? value : "-") + ''; } - }, - {field: 'applyTime',title: '申请时间'}, - {field: 'taskId', title: '当前任务ID',visible: false}, - {field: 'todoUserId',title: '待办用户ID',visible: false}, - {field: 'taskName',title: '当前任务名称',align: 'center', visible: false, - formatter: function(value, row, index) { return '' + value + ''; } - }, - { title: '审核状态',field: 'auditStatus', visible: false, - formatter: function (value, row, index) { return $.table.selectDictLabel(auditStatusDatas, value);} - }, - {title: '使用状态',field: 'useStatus', - formatter: function (value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);}, - }, - {title:'业务员',field:'businessMembers'}, - {title: '客户报价编号',field: 'supplierCode'}, - {title: '客户编号',field: 'customerCode'}, - {title: '客户名称',field: 'customerName'}, - {title: '物料合计',field: 'enterprise', + {title: '客户报价编号',field: 'supplierCode',align: 'center'}, + {title: '客户编号',field: 'customerCode',align: 'center'}, + {title: '客户名称',field: 'customerName',align: 'center'}, + {title: '物料合计',field: 'enterprise' ,align: 'center', footerFormatter: function (value) { var sum = 0; for (var i in value) { @@ -182,7 +177,7 @@ return "总物料合计: " + sum; } }, - {title: '数量合计',field: 'enterpriseSum', + {title: '数量合计',field: 'enterpriseSum',align: 'center', footerFormatter: function (value) { var sum = 0; for (var i in value) { @@ -191,89 +186,110 @@ return "总数量合计: " + sum; } }, - {title: '报价币种',field: 'commonCurrency', + {title: '报价币种',field: 'commonCurrency',align: 'center', formatter: function (value, row, index) {return $.table.selectDictLabel(currencyDatas, value);} }, - {title: '国内汇率',field: 'rmbTax'}, - {title: '美元汇率',field: 'usdTax'}, - {title: '不含税总价(RMB)',field: 'noRmbSum', + + {title: '国内汇率',field: 'rmbTax',align: 'center'}, + {title: '美元汇率',field: 'usdTax',align: 'center'}, + + {title: '不含税单价(RMB)',field: 'noRmb',align: 'center', footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].noRmbSum) || 0; + sum += parseFloat(value[i].noRmb) || 0; } - return "总不含税总价: " + sum.toFixed(2); + return "总不含税单价(RMB): " + sum.toFixed(2); } }, - {title: '含税总价(RMB)',field: 'rmbSum', + {title: '含税单价(RMB)',field: 'rmb',align: 'center', footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].rmbSum) || 0; + sum += parseFloat(value[i].rmb) || 0; } - return "总含税总价: " + sum.toFixed(2); + return "总含税单价(RMB): " + sum.toFixed(2); } }, - {title: '不含税总价(美元)',field: 'noUsdSum', + {title: '不含税单价($)',field: 'noUsd',align: 'center', footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].noUsdSum) || 0; + sum += parseFloat(value[i].noUsd) || 0; } - return "总不含税总价: " + sum.toFixed(2); + return "总不含税单价($): " + sum.toFixed(2); } }, - {title: '含税总价(美元)',field: 'usdSum', + {title: '含税单价($)',field: 'usd',align: 'center', footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].usdSum) || 0; + sum += parseFloat(value[i].usd) || 0; } - return "总含税总价: " + sum.toFixed(2); + return "总含税单价($): " + sum.toFixed(2); } }, - {title: '不含税单价(RMB)',field: 'noRmb', + {title: '不含税总价(RMB)',field: 'noRmbSum',align: 'center', footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].noRmb) || 0; + sum += parseFloat(value[i].noRmbSum) || 0; } - return "总不含税单价: " + sum.toFixed(2); + return "总不含税总价(RMB): " + sum.toFixed(2); } }, - {title: '含税单价(RMB)',field: 'rmb', + {title: '含税总价(RMB)',field: 'rmbSum',align: 'center', footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].rmb) || 0; + sum += parseFloat(value[i].rmbSum) || 0; } - return "总含税单价: " + sum.toFixed(2); + return "总含税总价(RMB): " + sum.toFixed(2); } }, - {title: '不含税单价(美元)',field: 'noUsd', + {title: '不含税总价($)',field: 'noUsdSum',align: 'center', footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].noUsd) || 0; + sum += parseFloat(value[i].noUsdSum) || 0; } - return "总不含税单价: " + sum.toFixed(2); + return "总不含税总价($): " + sum.toFixed(2); } }, - {title: '含税单价(美元)',field: 'usd', + {title: '含税总价($)',field: 'usdSum',align: 'center', footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].usd) || 0; + sum += parseFloat(value[i].usdSum) || 0; } - return "总含税单价: " + sum.toFixed(2); + return "总含税总价($): " + sum.toFixed(2); + } + }, + {title: '使用状态',field: 'useStatus',align: 'center', + formatter: function (value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);}, + }, + {field: 'applyUserName', title: '申请人',align: 'center'}, + {field: 'applyTime',title: '申请时间',align: 'center', + formatter: function(value, row, index) { + return $.table.tooltip(value, 10, "open"); + } + }, + {title:'业务员',field:'businessMembers',align: 'center'}, + + {title: '定价时间',field: 'pricingDate',align: 'center'}, + {title: '录入人',field: 'createBy',align: 'center'}, + {title: '录入时间',field: 'createTime',sortable: true,align: 'center', + formatter: function(value, row, index) { + return $.table.tooltip(value, 10, "open"); + } + }, + {title: '更新人',field: 'updateBy',align: 'center'}, + { title: '上次修改时间',field: 'updateTime',align: 'center', + formatter: function(value, row, index) { + return $.table.tooltip(value, 10, "open"); } }, - {title: '定价时间',field: 'pricingDate'}, - {title: '录入人',field: 'createBy'}, - {title: '录入时间',field: 'createTime'}, - {title: '更新人',field: 'updateBy'}, - { title: '上次修改时间',field: 'updateTime'}, {title: '备注',field: 'remark'}, { title: '操作', @@ -283,11 +299,11 @@ var actions = []; if(row.auditStatus=="1" && row.useStatus=="1" && !row.cancelInstanceId){ // 作废 - actions.push(' 作废'); + actions.push(' 作废'); // 编辑 - actions.push(' 编辑 '); + actions.push(' 编辑 '); }else{ - actions.push(' 编辑 '); + actions.push(' 编辑 '); } // 已作废 if(row.useStatus=="2" && !row.restoreInstanceId){ @@ -305,12 +321,12 @@ } } // 审批历史 - actions.push(' 审批历史 '); + actions.push(' 审批历史 '); // 进度查看 - actions.push(' 进度查看 '); + actions.push(' 进度查看 '); } // 详情 - actions.push(' 详情 '); + actions.push(' 详情 '); var actionLinks = actions.join(''); return $.table.dropdownToggle(actionLinks); } @@ -342,6 +358,12 @@ } } + // //双击某格触发事件 + // function onDblClickCell(field, value, row, $element){ + // alert("双击格name：" + field + " value：" + value); + // } + + // 作废 function cancel(id) {