From 3ccce3be12014d7996e795433220b67b116abf9d Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 18 Sep 2024 09:24:17 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
=?UTF-8?q?=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=B0=83=E6=95=B4=E9=94=80?=
=?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E5=89=8D=E7=AB=AF=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=9A=E5=BD=93=E5=89=8D=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E3=80=81=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=BC=96=E5=8F=B7?=
=?UTF-8?q?=E3=80=81=E5=AE=A2=E6=88=B7=E8=AE=A2=E5=8D=95=E7=BC=96=E5=8F=B7?=
=?UTF-8?q?=E3=80=81=E5=AE=A2=E6=88=B7ID=E3=80=81=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=E5=90=8D=E7=A7=B0=E3=80=81=E7=89=A9=E6=96=99=E6=95=B0=E5=90=88?=
=?UTF-8?q?=E8=AE=A1=E3=80=81=E6=95=B0=E9=87=8F=E5=90=88=E8=AE=A1=E3=80=81?=
=?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7(RMB)=E3=80=81?=
=?UTF-8?q?=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7(RMB)=E3=80=81=E4=B8=8D?=
=?UTF-8?q?=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7(=E7=BE=8E=E5=85=83)?=
=?UTF-8?q?=E3=80=81=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7(=E7=BE=8E?=
=?UTF-8?q?=E5=85=83)=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB?=
=?UTF-8?q?=E4=BB=B7(RMB)=E3=80=81=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7(RMB?=
=?UTF-8?q?)=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7(?=
=?UTF-8?q?=E7=BE=8E=E5=85=83)=E3=80=81=E5=90=AB=E7=A8=8E=E6=80=BB?=
=?UTF-8?q?=E4=BB=B7(=E7=BE=8E=E5=85=83)=E7=9A=84=E6=8E=92=E5=88=97?=
=?UTF-8?q?=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/salesOrder/salesOrder.html | 108 +++++++++---------
1 file changed, 57 insertions(+), 51 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
index ec8773c6..55bb10c0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
@@ -296,53 +296,10 @@
return '' + value + '';}
},
- {
- field: 'applyUserName',
- title: '申请人',
- formatter: function(value, row, index) {
- return '' + (value ? value : "-") + '';
- }
- },
- {field: 'applyTime',title: '申请时间'
- },
- {title: '当前任务ID',field: 'taskId',visible: false},
- { title: '待办用户ID',field: 'todoUserId', visible: false},
- { title: '当前任务名称',field: 'taskName',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: 'makeStatus',formatter:function(value, row, index) {
- return $.table.selectDictLabel(makeStatusDatas, value);}
- },
- {title: '出货状态',field: 'deliveryStatus',formatter:function(value, row, index) {
- return $.table.selectDictLabel(deliveryStatusDatas, value);}
- },
- {title: '收款结案状态',field:'closeStatus',formatter:function(value, row, index){
- return $.table.selectDictLabel(closeStatusDatas, value);
- }
- },
- {title: '业务人员',field: 'businessMembers',visible: false},
- {title: '是否开票',field:'invoice',formatter:function(value, row, index){
- return $.table.selectDictLabel(sysWhetherDatas, value);
- }
- },
- {title: '销售单号',field: 'salesOrderCode'},
- {title: '订单类型',field: 'salesOrderType',formatter: function(value, row, index) {
- return $.table.selectDictLabel(salesOrderTypeDatas, value);
- }
- },
+ {title: '销售订单编号',field: 'salesOrderCode'},
+ {title: '客户订单编号',field: 'salesOrderNumber'},
{title: '客户ID',field: 'enterpriseCode',},
{title: '客户名称',field: 'enterpriseName'},
- {title: '客户订单号',field: 'salesOrderNumber'},
{title: '物料数合计',field: 'materialSum',
footerFormatter: function (value) {
var sum = 0;
@@ -351,7 +308,7 @@
}
return "总物料: " + sum;
}
- },
+ },
{title: '数量合计',field: 'enterpriseSum',
footerFormatter: function (value) {
var sum = 0;
@@ -361,10 +318,7 @@
return "总数量: " + sum;
}
},
- {title: '是否含税',field:'confirmTax',formatter:function(value, row, index) {
- return $.table.selectDictLabel(confirmTaxDatas, value);
- }
- },
+
{title: '不含税单价(RMB)',field: 'noRmbPrice',visible:false},
{title: '含税单价(RMB)',field: 'rmbTaxPrice',visible:false},
{title: '不含税单价(美元)',field: 'noUsdPrice',visible:false},
@@ -404,7 +358,59 @@
}
return "总含税总价: " + sum.toFixed(2);
}
- },
+ },
+
+ {
+ field: 'applyUserName',
+ title: '申请人',
+ formatter: function(value, row, index) {
+ return '' + (value ? value : "-") + '';
+ }
+ },
+ {field: 'applyTime',title: '申请时间'
+ },
+ {title: '当前任务ID',field: 'taskId',visible: false},
+ { title: '待办用户ID',field: 'todoUserId', visible: false},
+ { title: '当前任务名称',field: 'taskName',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: 'makeStatus',formatter:function(value, row, index) {
+ return $.table.selectDictLabel(makeStatusDatas, value);}
+ },
+ {title: '出货状态',field: 'deliveryStatus',formatter:function(value, row, index) {
+ return $.table.selectDictLabel(deliveryStatusDatas, value);}
+ },
+ {title: '收款结案状态',field:'closeStatus',formatter:function(value, row, index){
+ return $.table.selectDictLabel(closeStatusDatas, value);
+ }
+ },
+ {title: '业务人员',field: 'businessMembers',visible: false},
+ {title: '是否开票',field:'invoice',formatter:function(value, row, index){
+ return $.table.selectDictLabel(sysWhetherDatas, value);
+ }
+ },
+ {title: '订单类型',field: 'salesOrderType',formatter: function(value, row, index) {
+ return $.table.selectDictLabel(salesOrderTypeDatas, value);
+ }
+ },
+
+
+
+ {title: '是否含税',field:'confirmTax',formatter:function(value, row, index) {
+ return $.table.selectDictLabel(confirmTaxDatas, value);
+ }
+ },
+
{title: '计划交付时间',field:'deliveryTime' ,visible: false},
{title: '付款条件',field: 'paymentTerms'},
{title: '交货条件',field: 'deliveryConditions'},