root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[update]销售模块:出货通知单静态页面、出货资料静态主页面

dev
zhangsiqi 9 months ago
parent
85d26b1143
commit
5e04982638
4 changed files with 414 additions and 307 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 253
      ruoyi-admin/src/main/resources/templates/erp/utb/utbcoef.html
  2. 149
      ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
  3. 199
      ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html
  4. 120
      ruoyi-admin/src/main/resources/templates/system/developReviseOrder/developReviseOrder.html

253
ruoyi-admin/src/main/resources/templates/erp/utb/utbcoef.html
View File

@ -5,22 +5,245 @@
<th:block th:include="include :: select2-css" />
<link th:href="@{/ajax/libs/element-ui/element-ui.css}" rel="stylesheet"/>
</head>
<style>
.currency:before{
content:'%'
}
</style>
<body class="white-bg">
<div id="app" class="wrapper wrapper-content animated fadeInRight ibox-content" >
<h2>业务绩效配置</h2>
<form class="form-horizontal m" id="form-material-edit" th:object="${erpMaterial}">
<input name="id" th:field="*{id}" type="hidden">
<div class="form-group">
<div class="col-sm-8">
超过 <input class="form-control" type="text" disabled>至<input class="form-control" type="text" disabled>
<h2 class="form-header">业务绩效配置</h2>
<form class="form-horizontal m" id="form-utbCoef-edit">
<div class="container-div">
<div class="form-row">
<h4 class="form-header">个人绩效（业务员、业务经理、业务主管）</h4>
</div>
<input name="id" type="text" hidden="hidden">
<div class="form-row">
<div class="col-md-12">
<san class="text-danger">超过</san>
<input class="form-row" type="text" value="0.00" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" disabled>
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')"/>
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')"/>
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" >
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')"/>
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')"/>
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')"/>
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')"/>
</div>
</div>
</div>
<div class="container-div">
<div class="form-row">
<h4 class="form-header">团队绩效（业务经理）</h4>
</div>
<div class="form-row">
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" value="0.00" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" disabled>
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" >
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" >
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" >
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" >
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" >
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">：</label>
<div class="container-div">
<div class="form-row">
<h4 class="form-header">团队绩效（业务主管）</h4>
</div>
<div class="form-row">
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" value="0.00" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" disabled>
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')"/>
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')"/>
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')"/>
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')"/>
</div>
</div>
</div>
<div class="container-div">
<div class="form-row">
<h4 class="form-header">业务服务员（业务服务员）</h4>
</div>
<div class="form-row">
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" value="0.00" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" disabled>
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" >
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
<div class="col-md-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" >
<span class="text-danger">至</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')">
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: select2-js" />
@ -28,6 +251,16 @@
<script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
<script type="text/javascript">
var prefix = ctx + "erp/utb";
function submitHandler() {
if ($.validate.form()) {
var formData = $('#form-utbCoef-edit').serializeArray();
console.log("formData",formData);
var jsonData = $.common.formDataToJson(formData);
console.log("jsonData");
console.log(jsonData);
$.operate.saveJson(prefix + "/add", jsonData);
}
}
</script>
</body>
</html>

149
ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
View File

@ -44,17 +44,17 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manufacture:deliveryGoodsDetail:add">
<!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manufacture:deliveryGoodsDetail:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manufacture:deliveryGoodsDetail:edit">
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manufacture:deliveryGoodsDetail:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manufacture:deliveryGoodsDetail:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="manufacture:deliveryGoodsDetail:export">
<i class="fa fa-download"></i> 导出
</a> -->
<a class="btn btn-success blue" onclick="$.table.exportExcel()" shiro:hasPermission="manufacture:deliveryGoodsDetail:export">
<i class="fa fa-download"></i> 导出文件
</a>
</div>
<div class="col-sm-12 select-table table-striped">
@ -75,97 +75,56 @@
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "发货通知单详情",
columns: [{
checkbox: true
},
{
field: 'deliveryGoodsDetailId',
title: '发货通知单详情id',
visible: false
},
{
field: 'noticeOrderNumber',
title: '通知单号',
visible: false
},
{
field: 'salesOrderNumber',
title: '订单号码'
},
{
field: 'enterpriseCode',
title: '客户代码',
visible: false
},
{
field: 'enterpriseName',
title: '客户名称',
visible: false
},
{
field: 'finishProductCode',
title: '成品代码'
},
{
field: 'finishProductName',
title: '成品名称'
},
{
field: 'specificationModel',
title: '规格型号'
},
{
field: 'customerNumber',
title: '客户料号'
},
{
field: 'typeMachine',
title: '机种',
visible: false
},
{
field: 'inventoryUnit',
title: '单位'
},
{
field: 'productQuantity',
title: '数量'
},
{
field: 'commonCurrency',
title: '币别'
},
{
field: 'processPrice',
title: '单价'
},
{
field: 'amountMoney',
title: '金额'
},
{
field: 'salesExplain',
title: '说明'
},
{
field: 'line',
title: '订单项次'
},
{
field: 'versionNumber',
title: '版本号'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.deliveryGoodsDetailId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.deliveryGoodsDetailId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
modalName: "出货通知单列表",
fixedColumns:true,
fixedRightNumber:1,
columns: [
{checkbox: true},
{field: 'deliveryGoodsDetailId',title: '发货通知单详情id', visible: false},
{title: '出库单号',field: 'noticeOrderNumber',visible: false},
{title: '出货状态',field: 'deliveryGoodsFlag',visible: false,
formatter: function(value, row, index) {
return $.table.selectDictLabel(deliveryGoodsFlagDatas, value);
}
},
{title: '员工ID',field: 'staffNo',visible: false},
{title: '业务员',field: 'saleStaff'},
{title: '关联出库单号',field: '',},
{title: '订单类型',field: '',},
{title: '客户ID',field: 'enterpriseCode'},
{title: '客户公司名称',field: 'enterpriseName'},
{title: '联系人',field: 'customerContact',visible: false},
{title: '客户厂区',field: 'customerFactory',visible: false},
{title: '客户订单号',field: '',},
{title: '物料总量数量合计',field: '',},
{title: '国内汇率',field: 'rmbTax',visible: false},
{title: '美元汇率',field: 'usdTax',visible: false},
{title: '不含税总价(RMB)',field: 'noRmbSum'},
{title: '含税总价(RMB)',field: 'rmbSum'},
{title: '付款条件',field: 'paymentTerms'},
{title: '国内汇率',field: ''},
{title: '美元汇率',field: ''},
{title: '不含税总价(RMB)',field: ''},
{title: '含税总价(RMB)',field: ''},
{title: '不含税总价(美元)',field: ''},
{title: '计划交付时间',field: ''},
{title: '客户验收时间',field: ''},
{title: '付款条件',field: ''},
{title: '交付条件',field: ''},
{title: '收货人联系人联系电话',field: ''},
{title: '送货日期',field: 'deliveryDate'},
{title: '收货地址',field: 'deliveryAddress'},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.deliveryGoodsDetailId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.deliveryGoodsDetailId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}
}]
]
};
$.table.init(options);
});

199
ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html
View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('发货通知单列表')" />
<th:block th:include="include :: header('出货资料列表')" />
<th:block th:include="include :: datetimepicker-css"/>
<script type="text/javascript" th:src="@{/js/axios.min.js}"></script>
</head>
@ -13,34 +13,38 @@
<div class="select-list">
<ul>
<li>
<label>通知单号：</label>
<label>出货资料单号 ：</label>
<input type="text" name="noticeOrderNumber"/>
</li>
<li>
<label>发货日期：</label>
<input type="text" name="deliveryDate"/>
<label>出货资料类型 ：</label>
<input type="text" name=""/>
</li>
<li>
<label>客户代码：</label>
<input type="text" name="enterpriseCode"/>
<label>模版类型 ：</label>
<input type="text" name=""/>
</li>
<li>
<label>客户名称：</label>
<input type="text" name="enterpriseName"/>
<label>业务员：</label>
<input type="text"/>
</li>
<li style="display: none">
<label>内外销：</label>
<select name="exportSales" th:with="type=${@dict.getType('sys_export_sales')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
<li>
<label>仓库员 ：</label>
<input type="text"/>
</li>
<li>
<label>关联订单号 ：</label>
<input type="text" name=""/>
</li>
<li style="display: none">
<label>发货否：</label>
<select name="deliveryGoodsFlag" th:with="type=${@dict.getType('sys_whether')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
<li>
<label>订单类型 ：</label>
<input type="text" name=""/>
</li>
<li class="select-time">
<label>录入时间 ：</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@ -52,7 +56,7 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manufacture:deliveryGoodsNotice:add">
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manufacture:deliveryGoodsNotice:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manufacture:deliveryGoodsNotice:edit">
@ -60,10 +64,10 @@
</a>
<a class="btn btn-danger multiple disabled" onclick="removeSelected()" shiro:hasPermission="manufacture:deliveryGoodsNotice:remove">
<i class="fa fa-remove"></i> 删除
</a> -->
<a class="btn btn-success blue single disabled" onclick="exportNotice()" shiro:hasPermission="manufacture:deliveryGoodsNotice:export">
<i class="fa fa-download"></i> 导出文件
</a>
<!-- <a class="btn btn-warning single disabled" onclick="exportNotice()" shiro:hasPermission="manufacture:deliveryGoodsNotice:export">-->
<!-- <i class="fa fa-download"></i> 导出-->
<!-- </a>-->
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" style="white-space: nowrap"></table>
@ -87,98 +91,62 @@
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
clickToSelect: true,
modalName: "发货通知单",
columns: [{
checkbox: true
},
{
field: 'deliveryGoodsNoticeId',
title: '发货通知单id',
visible: false
},
{
field: 'noticeOrderNumber',
title: '通知单号'
},
{
field: 'deliveryDate',
title: '发货日期'
},
{
field: 'enterpriseCode',
title: '客户代码'
},
{
field: 'enterpriseName',
title: '客户名称'
},
{
field: 'customerContact',
title: '联系人'
},
{
field: 'customerFactory',
title: '客户厂区'
},
{
field: 'deliveryAddress',
title: '送货地址'
},
{
field: 'exportSales',
title: '内外销',
visible: false,
formatter: function(value, row, index) {
return $.table.selectDictLabel(exportSalesDatas, value);
}
},
{
field: 'stockNumber',
title: '仓库编号'
},
{
field: 'stockName',
title: '仓库名称'
},
{
field: 'remarks',
title: '备注'
},
{
field: 'voucherPreparation',
title: '制单人'
},
{
field: 'deliveryGoodsFlag',
title: '发货否',
visible: false,
formatter: function(value, row, index) {
return $.table.selectDictLabel(deliveryGoodsFlagDatas, value);
}
},
{
field: 'firstAddTime',
title: '录入时间',
formatter: function (value, row, index) {
if (value == null) {
return " ";
} else {
return value;
}
}
},
{
field: 'updateInfoTime',
title: '上次修改时间',
formatter: function (value, row, index) {
if (value == null) {
return " ";
} else {
var vArr = value.split(',')
return vArr[0];
modalName: "出货资料列表",
columns: [
{checkbox: true},
{field: 'deliveryGoodsNoticeId',title: '出货通知单Id',visible: false},
{field: 'noticeOrderNumber',title: '出货通知单号'},
{title: '资料类型',field: '',},
{title: '模版类型',field: 'shipping_template',},
{title: '员工ID',field: 'staffNo',visible: false},
{title: '业务员',field: 'saleStaff'},
{title: '关联出库单号',field: '',},
{title: '订单类型',field: '',},
{title: '客户ID',field: 'enterpriseCode'},
{title: '客户公司名称',field: 'enterpriseName'},
{title: '联系人',field: 'customerContact',visible: false},
{title: '客户厂区',field: 'customerFactory',visible: false},
{title: '客户订单号',field: '',},
{title: '物料总量数量合计',field: '',},
{title: '国内汇率',field: 'rmbTax',visible: false},
{title: '美元汇率',field: 'usdTax',visible: false},
{title: '不含税总价(RMB)',field: 'noRmbSum'},
{title: '含税总价(RMB)',field: 'rmbSum'},
{title: '付款条件',field: 'paymentTerms'},
{title: '国内汇率',field: ''},
{title: '美元汇率',field: ''},
{title: '不含税总价(RMB)',field: ''},
{title: '含税总价(RMB)',field: ''},
{title: '不含税总价(美元)',field: ''},
{title: '计划交付时间',field: ''},
{title: '客户验收时间',field: ''},
{title: '付款条件',field: ''},
{title: '交付条件',field: ''},
{title: '收货人联系人联系电话',field: ''},
{title: '送货日期',field: 'deliveryDate'},
{title: '收货地址',field: 'deliveryAddress'},
{title: '仓库编号',field: 'stockNumber',visible: false},
{title: '仓库名称',field: 'stockName',visible: false},
{title: '备注',field: 'remarks'},
{title: '出货状态',field: 'deliveryGoodsFlag',visible: false,
formatter: function(value, row, index) {
return $.table.selectDictLabel(deliveryGoodsFlagDatas, value);
}
},
{title: '内外销',field: 'exportSales',visible: false,
formatter: function(value, row, index) {return $.table.selectDictLabel(exportSalesDatas, value);}
},
{title: '发货否',field: 'deliveryGoodsFlag',visible: false,
formatter: function(value, row, index) {return $.table.selectDictLabel(deliveryGoodsFlagDatas, value);}
},
{title: '录入时间',field: 'createTime',
formatter: function (value, row, index) {if (value == null) {return " ";} else {return value;}}
},
{title: '更新人',field: 'updateBy',visible: false},
{title: '上次修改时间',field: 'updateTime',
formatter: function (value, row, index) {if (value == null) {return " ";} else {var vArr = value.split(',');return vArr[0];}}
}
}]
]
};
$.table.init(options);
});
@ -246,11 +214,8 @@
window.URL.revokeObjectURL(URL)//释放内存
})
});
}
}
</script>
</body>
</html>

120
ruoyi-admin/src/main/resources/templates/system/developReviseOrder/developReviseOrder.html
View File

@ -74,15 +74,15 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:developReviseOrder:add">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:developReviseOrder:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="erp:developReviseOrder:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="erp:developReviseOrder:remove">
<i class="fa fa-remove"></i> 删除
</a>
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="erp:developReviseOrder:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="erp:developReviseOrder:remove">
<i class="fa fa-remove"></i> 删除
</a> -->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="erp:developReviseOrder:export">
<i class="fa fa-download"></i> 导出
</a>
@ -117,90 +117,40 @@
columns: [{
checkbox: true
},
{
field: 'oderId',
title: '开发修改单编号',
visible: false
},
{
field: 'developOdercode',
title: '开发修改单单号'
},
{
field: 'materialNo',
title: '料号'
},
{
field: 'eceiptStatus',
title: '采购入库状态'
},
{
field: 'qualityStatus',
title: '品质状态'
},
{
field: 'auditStatus',
title: '审核状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(auditStatusDatas, value);
}
},
{
field: 'completeStatus',
title: '完成状态'
},
{
field: 'materialName',
title: '物料名称'
},
{
field: 'materialType',
title: '物料类型',
formatter: function(value, row, index) {
return $.table.selectDictLabel(materialTypeDatas, value);
return $.table.selectDictLabel(auditStatusDatas, value);
}
},
{
field: 'unit',
title: '单位',
formatter: function(value, row, index) {
return $.table.selectDictLabel(unitDatas, value);
}
},
{
field: 'photoUrl',
title: '图片地址'
},
{
field: 'brand',
title: '品牌'
},
{
field: 'describe',
title: '描述'
},
{
field: 'processMethod',
title: '加工方式',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
}
},
{
field: 'createBy',
title: '工程员'
},
{
field: 'createTime',
title: '录入时间'
},
{
field: 'remark',
title: '备注信息'
},
{
title: '操作',
align: 'center',
{field: 'completeStatus',title: '完成状态'},
{field:'',title:'确认状态'},
{field: 'oderId', title: '开发修改单编号',visible: false},
{field: 'developOdercode',title: '开发修改单单号'},
{field: 'eceiptStatus',title: '采购入库状态'},
{field: 'qualityStatus',title: '品质状态'},
{field: 'staffNo', title: '员工ID', visible: false},
{field: 'saleStaff', title: '工程员'},
{field: 'materialNo',title: '料号'},
{field: 'completeStatus',title: '完成状态'},
{field: 'materialName',title: '物料名称'},
{field: 'materialType',title: '物料类型',
formatter: function(value, row, index) {return $.table.selectDictLabel(materialTypeDatas, value);}
},
{field: 'unit',title: '单位',
formatter: function(value, row, index) {return $.table.selectDictLabel(unitDatas, value);}
},
{field: 'photoUrl',title: '图片地址'},
{field: 'brand',title: '品牌'},
{field: 'describe',title: '描述'},
{field: 'processMethod',title: '加工方式',
formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}
},
{field: 'createBy',title: '录入人'},
{field: 'createTime',title: '录入时间'},
{field: 'remark',title: '备注信息'},
{title: '操作',align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.oderId + '\')"><i class="fa fa-edit"></i>编辑</a> ');

Write Preview
Loading…
Cancel
Save