Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -71,7 +71,7 @@ var table = {
                     rightFixedColumns: false,
                     fixedRightNumber: 0,
                     queryParams: $.table.queryParams,
-                    // height: $(window).height() - 100,
+                    height: $(window).height() + 10,
                     rowStyle: {},
                 };
             	var options = $.extend(defaults, options);
@@ -329,9 +329,8 @@ var table = {
             // 下拉按钮切换
             dropdownToggle: function (value) {
                 var actions = [];
-                actions.push('<div class="btn-group" style="width:100px;">');
+                actions.push('<div class="btn-group" style="width:100px;display: flex; justify-content: center; align-items: center;">');
                 actions.push('<button type="button" class="btn btn-xs dropdown-toggle" data-toggle="dropdown" aria-expanded="false">');
-                // 使用较大的图标
                 actions.push('<i class="fa fa-lg fa-cog"></i>&nbsp;'); // fa-lg 类可以使图标变大
                 actions.push('<span class="fa fa-lg fa-chevron-down"></span>'); // fa-lg 类可以使图标变大
                 actions.push('</button>');

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

@@ -466,7 +466,16 @@
                 {title: '流程恢复实例ID',field: 'restoreInstanceId', visible: false},
                 {title: '流程实例类型',field: 'instanceTypeName',visible: false},
                 { title: '申请人ID',field: 'applyUser',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 '<span class="badge badge-primary">' + value + '</span>';
+                    }
+                },
+                { 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 != "未启动"){
@@ -483,32 +492,25 @@
                         return '<span style="color: red;">' + (value ? value : "-") + '</span>';
                     }
                 },
-                {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 '<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: 'id',visible: false },
-                {title: '业务员',field: 'businessMembers',visible: false},
+
                 {title: '客户ID',field: 'enterpriseCode' },
                 {title: '客户公司名称',field: 'enterpriseName'},
                 {title: '客户公司简称',field: 'customerAbbreviation'},
                 {title: '英文名称',field: 'englishName'},
-                {title: '事业部',field: 'customerPurser'},
                 {title: '公司地址',field: 'customerAddress'},
+                {title: '送货地址',field: 'deliveryAddress'},
+                {title: '使用状态',field: 'useStatus',
+                    formatter: function (value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);},
+                },
+                {field: 'applyTime',title: '申请时间'},
+                {title: '业务员',field: 'businessMembers',visible: false},
+
+                {title: '事业部',field: 'customerPurser'},
+
                 {title: '内外销',field: 'exportSales',visible: false,
                     formatter: function (value, row, index) {return $.table.selectDictLabel(exportSalesDatas, value);},
                 },
-                {title: '送货地址',field: 'deliveryAddress'},
+
                 {title: '邮编',field: 'postalCode',visible: false},
                 {title: '国家地区',field: 'customerCountry',visible: false,
                     formatter: function (value, row, index) {return $.table.selectDictLabel(customerCountryDatas, value);},

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

@@ -117,7 +117,6 @@
                 fixedColumns: true, // 启用冻结列
                 fixedRightNumber: 1, // 冻结右列个数
                 //height: $(window).height() - 120,
-                height: $(window).height(),
                 modalName: "销售出货通知",
                 columns: [{
                     checkbox: true
@@ -285,7 +284,6 @@
 
                 {
                     title: '操作',
-                    width: 200,
                     align: 'center',
                     formatter: function(value, row, index) {