Browse Source

[feat]对于页面分页样式进行调整,调整为表格分页初始化样式。

dev
zhangsiqi 6 months ago
parent
commit
063897e119
  1. 33
      ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
  2. 1
      ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
  3. 4
      ruoyi-admin/src/main/resources/templates/erp/material/material.html
  4. 212
      ruoyi-admin/src/main/resources/templates/sales/EstimateChild/edit.html
  5. 6
      ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html

33
ruoyi-admin/src/main/resources/templates/erp/bom/bom.html

@ -135,7 +135,9 @@
importUrl: prefix + "/importData", importUrl: prefix + "/importData",
importTemplateUrl: prefix + "/importTemplate", importTemplateUrl: prefix + "/importTemplate",
pageList: [5, 10, 25, 50], pageList: [5, 10, 25, 50],
pageSize: 5, pageSize: 10,
sortable: true, // 是否启用排序
sortStable: true, // 设置为 true 将获得稳定的排序
modalName: "bom", modalName: "bom",
detailView: true, detailView: true,
fixedColumns: true, // 启用冻结列 fixedColumns: true, // 启用冻结列
@ -175,17 +177,19 @@
}, },
{ {
field: 'applyTime', field: 'applyTime',
title: '申请时间' title: '申请时间',
sortable: true,
}, },
{ {
field: 'taskId', field: 'taskId',
title: '当前任务ID', title: '当前任务ID',
visible: false visible: false,
}, },
{ {
field: 'todoUserId', field: 'todoUserId',
title: '待办用户ID', title: '待办用户ID',
visible: false visible: false,
}, },
{ {
field: 'taskName', field: 'taskName',
@ -198,6 +202,7 @@
{ {
field: 'auditStatus', field: 'auditStatus',
title: '审核状态', title: '审核状态',
sortable: true,
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(auditStatusDatas, value); return $.table.selectDictLabel(auditStatusDatas, value);
} }
@ -205,13 +210,14 @@
{ {
field: 'useStatus', field: 'useStatus',
title: '使用状态', title: '使用状态',
sortable: true,
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(useStatusDatas, value); return $.table.selectDictLabel(useStatusDatas, value);
} }
}, },
{title: '工程员',field: 'businessMembers'}, {title: '工程员',field: 'businessMembers', sortable: true,},
{title: 'bom号',field: 'bomNo',}, {title: 'bom号',field: 'bomNo', sortable: true,},
{title: '关联料号',field: 'materialNo'}, {title: '关联料号',field: 'materialNo', sortable: true,},
{ {
field: 'photoUrl', field: 'photoUrl',
title: '图片', title: '图片',
@ -219,10 +225,11 @@
return $.table.imageView(value); return $.table.imageView(value);
} }
}, },
{ title: '物料名称',field: 'materialName'}, { title: '物料名称',field: 'materialName', sortable: true,},
{ {
field: 'materialType', field: 'materialType',
title: '物料类型', title: '物料类型',
sortable: true,
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value); return $.table.selectCategoryLabel(materialTypeDatas, value);
} }
@ -230,6 +237,7 @@
{ {
field: 'processMethod', field: 'processMethod',
title: '半成品类型', title: '半成品类型',
sortable: true,
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -237,11 +245,12 @@
{ {
field: 'unit', field: 'unit',
title: '单位', title: '单位',
sortable: true,
}, },
{ title: '品牌',field: 'brand'}, { title: '品牌',field: 'brand', sortable: true,},
{title: '描述',field: 'describe'}, {title: '描述',field: 'describe', sortable: true,},
{title: '用量',field: 'useNum'}, {title: '用量',field: 'useNum', sortable: true,},
{title: '损耗率',field: 'lossRate', {title: '损耗率',field: 'lossRate', sortable: true,
formatter:function (value,row,index){ formatter:function (value,row,index){
if (value == null || value == ''){ if (value == null || value == ''){
return '/'; return '/';

1
ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html

@ -100,6 +100,7 @@
cancelUrl: prefix + "/cancel/{id}", cancelUrl: prefix + "/cancel/{id}",
restoreUrl: prefix + "/restore/{id}", restoreUrl: prefix + "/restore/{id}",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
pageSize: 10,
modalName: "开发修改单", modalName: "开发修改单",
columns: [{ columns: [{
checkbox: true checkbox: true

4
ruoyi-admin/src/main/resources/templates/erp/material/material.html

@ -167,8 +167,8 @@
cancelUrl: prefix + "/cancel/{id}", cancelUrl: prefix + "/cancel/{id}",
restoreUrl: prefix + "/restore/{id}", restoreUrl: prefix + "/restore/{id}",
detailUrl: prefix + "/detail/{id}", detailUrl: prefix + "/detail/{id}",
pageList: [5, 10, 25, 50], pageList: [10, 25, 50],
pageSize: 5, pageSize: 10,
modalName: "物料信息", modalName: "物料信息",
fixedColumns: true, // 启用冻结列 fixedColumns: true, // 启用冻结列
fixedRightNumber: 1, // 冻结右列个数 fixedRightNumber: 1, // 冻结右列个数

212
ruoyi-admin/src/main/resources/templates/sales/EstimateChild/edit.html

@ -0,0 +1,212 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改销售物料估价')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-EstimateChild-edit" th:object="${sysSalesEstimateChild}">
<input name="id" th:field="*{id}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">关联销售估价编号:</label>
<div class="col-sm-8">
<input name="quoteId" th:field="*{quoteId}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料表中的id:</label>
<div class="col-sm-8">
<input name="materialId" th:field="*{materialId}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料表中的编号:</label>
<div class="col-sm-8">
<input name="materialCode" th:field="*{materialCode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的名称:</label>
<div class="col-sm-8">
<input name="materialName" th:field="*{materialName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料相关的BOM编号:</label>
<div class="col-sm-8">
<input name="materialBom" th:field="*{materialBom}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的类型:</label>
<div class="col-sm-8">
<select name="materialType" class="form-control m-b">
<option value="">所有</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的加工方式:</label>
<div class="col-sm-8">
<input name="processMethod" th:field="*{processMethod}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的品牌:</label>
<div class="col-sm-8">
<input name="brand" th:field="*{brand}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的图片:</label>
<div class="col-sm-8">
<input name="photoUrl" th:field="*{photoUrl}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位:</label>
<div class="col-sm-8">
<input name="unit" th:field="*{unit}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的描述:</label>
<div class="col-sm-8">
<input name="describe" th:field="*{describe}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">国内税率:</label>
<div class="col-sm-8">
<input name="countTax" th:field="*{countTax}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">美元汇率:</label>
<div class="col-sm-8">
<input name="usdTax" th:field="*{usdTax}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的数量:</label>
<div class="col-sm-8">
<input name="materialNum" th:field="*{materialNum}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的对外报价:</label>
<div class="col-sm-8">
<input name="materialSole" th:field="*{materialSole}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的不含税单价(RMB):</label>
<div class="col-sm-8">
<input name="materialRmb" th:field="*{materialRmb}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的含税单价(RMB):</label>
<div class="col-sm-8">
<input name="materialNoRmb" th:field="*{materialNoRmb}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的不含税总价(RMB):</label>
<div class="col-sm-8">
<input name="materialRmbSum" th:field="*{materialRmbSum}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的含税总价(RMB):</label>
<div class="col-sm-8">
<input name="materialNoRmbSum" th:field="*{materialNoRmbSum}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的不含税单价(美元):</label>
<div class="col-sm-8">
<input name="materialNoUsd" th:field="*{materialNoUsd}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的含税单价(美元):</label>
<div class="col-sm-8">
<input name="materialUsd" th:field="*{materialUsd}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的不含税总价(美元):</label>
<div class="col-sm-8">
<input name="materialNoUsdSum" th:field="*{materialNoUsdSum}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料的含税总价(美元):</label>
<div class="col-sm-8">
<input name="materialUsdSum" th:field="*{materialUsdSum}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">计划交付时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="deliveryTime" th:value="${#dates.format(sysSalesEstimateChild.deliveryTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">质保天数:</label>
<div class="col-sm-8">
<input name="expiryDay" th:field="*{expiryDay}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注:</label>
<div class="col-sm-8">
<textarea name="remark" class="form-control">[[*{remark}]]</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">删除状态:</label>
<div class="col-sm-8">
<select name="useStatus" class="form-control m-b" th:with="type=${@dict.getType('useStatus')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{useStatus}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">审核状态:</label>
<div class="col-sm-8">
<select name="auditStatus" class="form-control m-b" th:with="type=${@dict.getType('auditStatus')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{auditStatus}"></option>
</select>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "sales/EstimateChild";
$("#form-EstimateChild-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-EstimateChild-edit').serialize());
}
}
$("input[name='deliveryTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

6
ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html

@ -70,6 +70,12 @@
cancelUrl: prefix + "/cancel/{id}", cancelUrl: prefix + "/cancel/{id}",
restoreUrl: prefix + "/restore/{id}", restoreUrl: prefix + "/restore/{id}",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
pagination: true,
pageNumber: 1, //初始化加载第一页,默认第一页
pageSize: 10, //每页的记录行数(*)
pageList: [10, 25, 50],
sortable: true, // 是否启用排序
sortStable: true,
modalName: "员工领料单", modalName: "员工领料单",
columns: [ columns: [
{checkbox: true}, {checkbox: true},

Loading…
Cancel
Save