diff --git a/ruoyi-admin/src/main/resources/templates/layout/product-list.html b/ruoyi-admin/src/main/resources/templates/layout/product-list.html
index 0a4b0f23..8e13f427 100644
--- a/ruoyi-admin/src/main/resources/templates/layout/product-list.html
+++ b/ruoyi-admin/src/main/resources/templates/layout/product-list.html
@@ -173,7 +173,7 @@
- |
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
index b9373b9e..18dfa558 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
@@ -3,6 +3,11 @@
+
@@ -92,6 +97,8 @@
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "发货记录",
+ fixedColumns: true,
+ fixedRightNumber: 1,
columns: [{
checkbox: true
},
@@ -101,11 +108,13 @@
visible: false
},
{
+ width: 150,
field: 'orderCode',
title: '合同编号',
},
{
+ width: 260,
field: 'orderName',
title: '合同名称',
formatter:function (value,row){
@@ -113,10 +122,12 @@
},
},
{
+ width: 100,
field: 'deliveryCode',
title: '发货单号'
},
{
+ width: 100,
field: 'total',
title: '发货数量',
escape:true,
@@ -129,10 +140,12 @@
}
},
{
+ width: 100,
field: 'deliveryDate',
title: '发货日期'
},
{
+ width: 100,
field: 'deliveryType',
title: '发货方式',
formatter: function(value, row, index) {
@@ -140,6 +153,7 @@
}
},
{
+ width: 100,
field: 'deliveryStatus',
title: '发货状态',
formatter: function(value, row, index) {
@@ -147,10 +161,12 @@
}
},
{
+ width: 100,
field: 'createByName',
title: '创建人'
},
{
+ width: 190,
title: '操作',
align: 'center',
formatter: function(value, row, index) {
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/order.html b/ruoyi-admin/src/main/resources/templates/manage/order/order.html
index f52a38f2..edad408e 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/order.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/order.html
@@ -7,6 +7,9 @@
.select-list li p, .select-list li label:not(.radio-box){
width: 95px;
}
+ .bootstrap-table table {
+ table-layout: fixed;
+ }
@@ -79,6 +82,8 @@
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "合同档案",
+ fixedColumns: true,
+ fixedRightNumber:1,
columns: [{
checkbox: true
},
@@ -88,26 +93,32 @@
visible: false
},
{
+ width:150,
field: 'orderCode',
title: '合同编号'
},
{
+ width:80,
field: 'versionCode',
title: '版本号'
},
{
+ width:260,
field: 'orderName',
title: '合同名称'
},
{
+ width:100,
field: 'projectCode',
title: '项目编号'
},
{
+ width:170,
field: 'customerName',
title: '最终客户名称'
},
{
+ width:100,
field: 'orderType',
title: '合同类型',
formatter: function(value, row, index) {
@@ -115,11 +126,13 @@
}
},
{
+ width:100,
field: 'orderDate',
title: '合同签定日期'
},
{
- field: 'createByName',
+ width:100,
+ field: 'createByName',
title: '创建人'
},
// {
@@ -127,6 +140,7 @@
// title: '合同状态'
// },
{
+ width:150,
title: '操作',
align: 'center',
formatter: function(value, row, index) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/agent/agent.html b/ruoyi-admin/src/main/resources/templates/system/agent/agent.html
index 06466dfa..4dade174 100644
--- a/ruoyi-admin/src/main/resources/templates/system/agent/agent.html
+++ b/ruoyi-admin/src/main/resources/templates/system/agent/agent.html
@@ -92,27 +92,32 @@
visible: false
},
{
+ width: 100,
field: 'agentCode',
title: '代表处编码'
},
{
+ width: 100,
field: 'agentName',
title: '代表处名称'
},
{
+ width: 100,
field: 'province',
title: '所在省'
},
{
+ width: 100,
field: 'city',
title: '所在市'
},
{
+ width: 100,
field: 'createAt',
title: '创建时间'
},
{
- width: '200',
+ width: '150',
title: '操作',
align: 'center',
formatter: function(value, row, index) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/info.html b/ruoyi-admin/src/main/resources/templates/system/customer/info.html
index a242e5de..e88e374e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/info.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/info.html
@@ -9,6 +9,9 @@
}
.bootstrap-table table {
table-layout: fixed;
+ th,td{
+ word-wrap: break-word;
+ }
}
@@ -115,17 +118,17 @@
title: '最终客户名称'
},
{
- width:100,
+ width:80,
field: 'customerPostcode',
title: '客户邮编'
},
{
- width:100,
+ width:80,
field: 'province',
title: '所在省'
},
{
- width:100,
+ width:80,
field: 'city',
title: '所在市'
},
@@ -152,7 +155,7 @@
{
width:100,
field: 'bgProperty',
- title: '所属行业',
+ title: 'BG',
formatter: (value, row) => {
return $.table.selectDictLabel([[${@dict.getType('bg_type')}]], value);
}
diff --git a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
index 642e8305..7fc1783c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
+++ b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
@@ -13,6 +13,9 @@
.select-list li p, .select-list li label:not(.radio-box){
width: 80px;
}
+ .bootstrap-table table {
+ table-layout: fixed;
+ }
@@ -77,7 +80,7 @@
-
+
|