Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1283
Star 158
Fork 129
S
Skyeye
提交 b79b6f53 编写于 作者: L LAPTOP-NDCM9L6Q\王丽雅
浏览文件
操作

update：修改整单委外单字段

上级 ad4c8f12
隐藏空白更改
内联 并排
Showing with 47 addition and 17 deletion
erp-produce/src/main/resources/template/js/erpPreProductionPlan/preProductionTurnToProduction.js
浏览文件 @ b79b6f53
......@@ -38,9 +38,8 @@ layui.config({
// 新增行的回调函数
tableAddRowCallback: function (tableId) {
$("#addRow" + tableId).remove();
$("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
$("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
}
});
}});
......
erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js
浏览文件 @ b79b6f53
......@@ -57,7 +57,7 @@ layui.config({
]],
done: function(json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入生产单号", function () {
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
......
erp-produce/src/main/resources/template/js/wholeOut/wholeOutList.js
浏览文件 @ b79b6f53
......@@ -27,20 +27,38 @@ layui.config({
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'oddNumber', title: '单号', align: 'center', width: 200, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
{ field: 'oddNumber', title: '单号', rowspan: '2', align: 'left', width: 220, templet: function (d) {
var str = '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
if (!isNull(d.fromId)) {
str += '<span class="state-new">[转]</span>';
}
return str;
}},
{ field: 'accountId', width: 150, title: '账户', align: 'center'},
// { field: 'departmentId', width: 150, title: '部门', align: 'center',templet: function (d) {
// if (!isNull(d.departmentMation)) {
// return d.departmentMation.name;
// }
// return '';
// }},
// // { field: 'farmId', width: 150, title: '车间', align: 'center'},
//
// { field: 'farmId', title: '车间', align: 'left', width: 150, templet: function (d) {
// if (!isNull(d.farmMation)) {
// return d.farmMation.name;
// }
// return '';
// }},
//
{ field: 'operTime', width: 150, title: '单据日期', align: 'center'},
{ field: 'farmId', width: 150, title: '车间', align: 'center'},
{ field: 'holderId', width: 150, title: '客户', align: 'center'},
{ field: 'departmentId', width: 120, title: '部门', align: 'center'},
{ field: 'salesman', width: 150, title: '业务员', align: 'center'},
{ field: 'planComplateTime', width: 140, title: '计划完成时间', align: 'center'},
{ field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'center', width: 120 },
// { field: 'farmId', width: 150, title: '车间', align: 'center'},
{ field: 'holderMation', title: '客户', rowspan: '2', align: 'center', width: 150, templet: function (d) {
return getNotUndefinedVal(d.holderMation?.name);
}},
{ field: 'processInstanceId', width: 200, title: '流程ID', align: 'center'},
// { field: 'state', title: '状态', width: 90, templet: function (d) {
// return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("purchaseOrderState", 'id', d.state, 'name');
// }},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
}},
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
......@@ -49,7 +67,7 @@ layui.config({
]],
done: function(json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入生产单号", function () {
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
......
erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionList.html
浏览文件 @ b79b6f53
......@@ -32,6 +32,19 @@
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# } }}
{{# if (d.state == 'pass' || d.state == 'partiallyCompleted') { }}
{{# if (d.productionType == 1) { }}
{{# if (auth('1720796297124')) { }}
<a class="layui-btn layui-btn-xs" lay-event="turnPurchase">转加工单</a>
{{# } }}
{{# } }}
{{# if (d.productionType == 2 ) { }}
{{# if (auth('1720835673573')) { }}
<a class="layui-btn layui-btn-xs" lay-event="transferToWaybill">转整单委外单</a>
{{# } }}
{{# } }}
{{# } }}
</script>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
......
erp/src/main/resources/template/js/salesOrder/chooseList.js
浏览文件 @ b79b6f53
......@@ -36,6 +36,7 @@ layui.config({
{ field: 'holderMation', title: '客户', rowspan: '2', align: 'left', width: 150, templet: function (d) {
return getNotUndefinedVal(d.holderMation?.name);
}},
{ field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 },
{ colspan: '2', title: '来源单据信息', align: 'center' },
......
erp/src/main/resources/template/js/salesOrder/salesOrderToOutlet.js
浏览文件 @ b79b6f53
......@@ -18,7 +18,6 @@ layui.config({
// 销售订单转销售出库
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "querySealsOrderTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
console.log(5555,data)
// 销售出库的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2023042700002', data, {
savePreParams: function (params) {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或