Skip to content

S
Skyeye

doc_wei / Skyeye

通知 1194
Star 154
Fork 127
S
Skyeye
提交 6bdb974e 编写于 作者: L LAPTOP-UV1MNL38\18023
浏览文件
操作

feat:新建转采购到货单和转采购入库单文件

上级 355c7cf1
隐藏空白更改
内联 并排
Showing with 216 addition and 10 deletion
erp/src/main/resources/template/js/purchaseOrder/purchaseOrderList.js
浏览文件 @ 6bdb974e
......@@ -39,6 +39,12 @@ layui.config({
{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
}},
{ field: 'otherState', title: '到货状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("orderArrivalState", 'id', d.otherState, 'name');
}},
{ field: 'qualityInspection', title: '质检状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("orderQualityInspectionType", 'id', d.qualityInspection , 'name');
}},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 },
......@@ -77,6 +83,8 @@ layui.config({
});
} else if (layEvent === 'turnPurchase') { //转采购入库单
turnPurchase(data);
} else if (layEvent === 'transferToWaybill') { //转到货单
transferToWaybill(data);
} else if (layEvent === 'processDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
......@@ -126,7 +134,7 @@ layui.config({
// 转采购入库
function turnPurchase(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2023050300001&id=' + data.id + '&serviceClassName=' + sysServiceMation["putIsPurchase"]["key"], null),
url: "../../tpl/purchaseOrder/purchaseToWarehouse.html?id=" + data.id,
title: "转采购入库",
pageId: "purchaseOrderToPut",
area: ['90vw', '90vh'],
......@@ -136,6 +144,18 @@ layui.config({
}});
}
function transferToWaybill(data){
parent._openNewWindows({
url: "../../tpl/purchaseOrder/purchaseToWaybill.html?id=" + data.id,
title: '转到货单',
pageId: "purchaseToWaybill",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
......
erp/src/main/resources/template/js/purchaseOrder/purchaseToWarehouse.js 0 → 100644
浏览文件 @ 6bdb974e
// 以下两个参数开启团队权限时有值
var objectId = '', objectKey = '';
// 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断
var serviceClassName;
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
var id = GetUrlParam("id");
// 采购合同转采购订单
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "querySupplierContractTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
data.erpOrderItemList = data.supplierContractChildList
console.log(data)
// 采购订单的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2023042300002', data, {
savePreParams: function (params) {
// params.holderId=data.objectId
// params.holderKey=data.objectKey
// params.id=id
},
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "purchaseorder009", params: params, type: 'json', method: "POST", callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
},
loadComponentCallback: function () {
$("div[controlType='supplier']").remove();
$("div[controlType='purchaseOrderFromType']").remove();
},
tableAddRowCallback: function (tableId) {
$("#addRow" + tableId).remove();
$("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
$("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
$("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
}
});
}});
});
\ No newline at end of file
erp/src/main/resources/template/js/purchaseOrder/purchaseToWaybill.js 0 → 100644
浏览文件 @ 6bdb974e
// 以下两个参数开启团队权限时有值
var objectId = '', objectKey = '';
// 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断
var serviceClassName;
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
var id = GetUrlParam("id");
// 采购合同转采购订单
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "querySupplierContractTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
data.erpOrderItemList = data.supplierContractChildList
console.log(data)
// 采购订单的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2023042000002', data, {
savePreParams: function (params) {
params.holderId=data.objectId
params.holderKey=data.objectKey
params.id=id
},
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "supplierContractToOrder", params: params, type: 'json', method: "POST", callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
},
loadComponentCallback: function () {
$("div[controlType='supplier']").remove();
$("div[controlType='purchaseOrderFromType']").remove();
},
tableAddRowCallback: function (tableId) {
$("#addRow" + tableId).remove();
$("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
$("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
$("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
}
});
}});
});
\ No newline at end of file
erp/src/main/resources/template/js/supplierContract/contractToOrder.js
浏览文件 @ 6bdb974e
......@@ -48,7 +48,7 @@ layui.config({
$("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
$("div[controlType='simpleTable']").find("select").prop('disabled', true);
$("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
......
erp/src/main/resources/template/tpl/purchaseOrder/purchaseOrderList.html
浏览文件 @ 6bdb974e
......@@ -32,9 +32,16 @@
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# } }}
{{# if (d.state == 'pass') { }}
{{# if (auth('1571812784641')) { }}
<a class="layui-btn layui-btn-xs" lay-event="turnPurchase">转采购入库</a>
{{# if (d.state == 'pass' || d.state == 'partiallyCompleted') { }}
{{# if (d.otherState == '1') { }}
{{# if (auth('1571812784641')) { }}
<a class="layui-btn layui-btn-xs" lay-event="turnPurchase">转采购入库</a>
{{# } }}
{{# } }}
{{# if (d.otherState == 2 || d.otherState == 3) { }}
{{# if (auth('1717984916030')) { }}
<a class="layui-btn layui-btn-xs" lay-event="transferToWaybill">转到货单</a>
{{# } }}
{{# } }}
{{# } }}
</script>
......
erp/src/main/resources/template/tpl/purchaseOrder/purchaseToWarehouse.html 0 → 100644
浏览文件 @ 6bdb974e
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div style="margin:0 auto;padding:20px;">
<form class="layui-form" action="" id="showForm" autocomplete="off">
<div id="content"></div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" type="button" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<button class="winui-btn" lay-submit lay-filter="formSaveDraft" id="formSaveDraft">保存为草稿</button>`
<button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">提交</button>
</div>
</div>
</form>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/purchaseOrder/'}).use('purchaseToWarehouse');
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/tpl/purchaseOrder/purchaseToWaybill.html 0 → 100644
浏览文件 @ 6bdb974e
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div style="margin:0 auto;padding:20px;">
<form class="layui-form" action="" id="showForm" autocomplete="off">
<div id="content"></div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" type="button" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<button class="winui-btn" lay-submit lay-filter="formSaveDraft" id="formSaveDraft">保存为草稿</button>`
<button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">提交</button>
</div>
</div>
</form>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/purchaseOrder/'}).use('purchaseToWaybill');
</script>
</body>
</html>
\ No newline at end of file
web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableChooseUtil.js
浏览文件 @ 6bdb974e
......@@ -300,11 +300,13 @@ var initTableChooseUtil = {
$("#" + tdId).val(value.name || value.title);
}
} else if (formType == 'select') {
if (!isNull(value["html"])) {
$("#" + tdId).html(value["html"]);
value = data[bean.id]['value'];
if (!isNull(value)) {
if (!isNull(value["html"])) {
$("#" + tdId).html(value["html"]);
value = data[bean.id]['value'];
}
$("#" + tdId).val(value);
}
$("#" + tdId).val(value);
} else if (formType == 'detail') {
$("#" + tdId).html(value);
}
......
web/src/main/resources/template/json/skyeyeClassEnum.json
浏览文件 @ 6bdb974e
......@@ -53,7 +53,6 @@
"machinPickStateEnum": {"name": "加工单领料状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinPickStateEnum"},
"machinChildStateEnum": {"name": "工序验收单状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinChildStateEnum"},
"materialNormsCodeInDepot": {"name": "商品规格一物一码库存状态", "className": "skyeye-erp#com.skyeye.material.classenum.MaterialNormsCodeInDepot"},
"orderQualityInspectionType": {"name": "ERP采购质检类型", "className": "skyeye-erp#com.skyeye.business.classenum.OrderQualityInspectionType"},
"orderItemQualityInspectionType": {"name": "ERP采购子单据质检类型", "className": "skyeye-erp#com.skyeye.business.classenum.OrderItemQualityInspectionType"},
"orderArrivalState": {"name": "采购订单到货状态", "className": "skyeye-erp#com.skyeye.purchase.classenum.OrderArrivalState"},
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或