From 4e5b92b9f718f3a745b1976f8ea68f18124bb43d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Tue, 26 Nov 2024 09:29:34 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=20=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A4=9A=E4=BD=99=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=97=E5=B1=85=E4=B8=AD=E6=98=BE=E7=A4=BA=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/makeorder/makeorder.html | 53 +++++++++++--------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
index 3c831c2b..8c701b57 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
@@ -135,16 +135,19 @@
                     title: '生产订单id',
                     visible: false
                 },
-                    {
-                        field: 'makeNo',
-                        title: '生产订单号'
-                    },
-                    {
-                        field: 'materialSum',
-                        title: '数量合计'
-                    },
+                {
+                    field: 'makeNo',
+                    title: '生产订单号',
+                    align: 'center',
+                },
+                {
+                    field: 'materialSum',
+                    align: 'center',
+                    title: '数量合计'
+                },
                 {
                     field: 'makeStatus',
+                    align: 'center',
                     title: '生产状态',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(makeStatusDatas, value);
@@ -152,15 +155,18 @@
                 },
                     {
                         field: 'finishNum',
+                        align: 'center',
                         title: '已完成数量'
                     },
                     {
                         field: 'eceiptNum',
+                        align: 'center',
                         title: '已入库数量'
                     },
 
                 {
                     field: 'eceiptStatus',
+                    align: 'center',
                     title: '入库状态',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(eceiptStatusDatas, value);
@@ -168,6 +174,7 @@
                 },
                 {
                     field: 'qualityStatus',
+                    align: 'center',
                     title: '品质状态',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(qualityStatusDatas, value);
@@ -175,6 +182,7 @@
                 },
                 {
                     field: 'useStatus',
+                    align: 'center',
                     title: '使用状态',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(useStatusDatas, value);
@@ -182,51 +190,47 @@
                 },
                 {
                     field: 'purchaseStatus',
+                    align: 'center',
                     title: '采购确认状态',
                     visible: false,
                 },
 
                 {
                     field: 'saleNo',
+                    align: 'center',
                     title: '关联销售订单号'
                 },
                 {
-                    field: 'Salesman',
-                    title: '业务员'
-                },
-                    {
                     field: 'orderType',
+                    align: 'center',
                     title: '订单类型',
-                        formatter: function(value, row, index) {
-                            return $.table.selectDictLabel(orderTypeDatas, value);
-                        }
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(orderTypeDatas, value);
+                    }
                 },
                 {
                     field: 'customerId',
+                    align: 'center',
                     title: '客户ID'
                 },
                 {
                     field: 'customerName',
+                    align: 'center',
                     title: '客户名称'
                 },
                 {
                     field: 'customerOderCode',
+                    align: 'center',
                     title: '客户订单号'
                 },
                 {
                     field: 'material',
+                    align: 'center',
                     title: '物料合计'
                 },
-                {
-                    field: 'noRate',
-                    title: '不含税生产成本(RMB)'
-                },
-                {
-                    field: 'rate',
-                    title: '含税生产成本(RMB)'
-                },
                 {
                     field: 'remark',
+                    align: 'center',
                     title: '备注'
                 },
                 {
@@ -237,16 +241,19 @@
 
                  {
                      title: '录入时间',
+                     align: 'center',
                      field: 'createTime',
                      sortable: true,
                  },
 
                  {
                      title: '更新人',
+                     align: 'center',
                      field: 'updateBy',
                  },
                  {
                      title: '上次更新时间',
+                     align: 'center',
                      field: 'updateTime',
                  },
                 {