[fix] 销售管理

按照万材调整销售订单前端列表页面：当前状态、销售订单编号、客户订单编号、客户ID、客户名称、物料数合计、数量合计、不含税单价(RMB)、含税单价(RMB)、不含税单价(美元)、含税单价(美元)、不含税总价(RMB)、含税总价(RMB)、不含税总价(美元)、含税总价(美元)的排列顺序

ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html

@@ -296,53 +296,10 @@
                         return '<span class="badge badge-primary">' + value + '</span>';}
                 },
 
-                {
-                    field: 'applyUserName',
-                    title: '<span style="color: red;">申请人</span>',
-                    formatter: function(value, row, index) {
-                        return '<span style="color: red;">' + (value ? value : "-") + '</span>';
-                    }
-                },
-                {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 '<span class="badge badge-primary">' + value + '</span>';
-                    }
-
-                },
-                {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;
@@ -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},
@@ -405,6 +359,58 @@
                         return "总含税总价: " + sum.toFixed(2);
                     }
                 },
+
+                {
+                    field: 'applyUserName',
+                    title: '<span style="color: red;">申请人</span>',
+                    formatter: function(value, row, index) {
+                        return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                    }
+                },
+                {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 '<span class="badge badge-primary">' + value + '</span>';
+                    }
+
+                },
+                {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'},