Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1411
Star 161
Fork 130
S
Skyeye
提交 ad84f562 编写于 作者: L LAPTOP-UV1MNL38\18023
浏览文件
操作

feat:新建质检单、转采购入库、转质检单文件

上级 0e7ea9eb
隐藏空白更改
内联 并排
Showing with 161 addition and 15 deletion
erp/src/main/resources/template/js/purchaseDeliveryNote/deliveryToPut.js 0 → 100644
浏览文件 @ ad84f562
// 以下两个参数开启团队权限时有值
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 + "queryPurchaseDeliveryTransPurchasePutById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
// 采购入库的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2023042300002', data, {
savePreParams: function (params) {
params.holderId=data.holderId
params.holderKey=data.holderKey
},
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "deliveryToPurchasePut", 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/purchaseDeliveryNote/purchaseDeliveryNoteList.js
浏览文件 @ ad84f562
......@@ -46,6 +46,9 @@ layui.config({
{ field: 'qualityInspection', title: '质检状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("orderQualityInspectionType", 'id', d.qualityInspection , 'name');
}},
{ field: 'otherState', title: '免检商品入库状态', rowspan: '2', width: 150, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("deliveryPutState", 'id', d.otherState, '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 },
......@@ -82,7 +85,11 @@ layui.config({
erpOrderUtil.submitOrderMation(data.id, serviceClassName, function() {
loadTable();
});
} else if (layEvent === 'processDetails') { // 工作流流程详情查看
} else if (layEvent === 'turnPurchase') { //转采购入库单
turnPurchase(data);
} else if (layEvent === 'purchaseQualityInspection') { //转质检单
purchaseQualityInspection(data);
}else if (layEvent === 'processDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
......@@ -128,6 +135,32 @@ layui.config({
}});
}
// 转采购入库
function turnPurchase(data) {
_openNewWindows({
url: "../../tpl/purchaseDeliveryNote/deliveryToPut.html?id=" + data.id,
title: "转采购入库",
pageId: "deliveryToPut",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
//转质检单
function purchaseQualityInspection(data){
parent._openNewWindows({
url: "../../tpl/purchaseDeliveryNote/deliveryToQualityInspection.html?id=" + data.id,
title: '转质检单',
pageId: "deliveryToQualityInspection",
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/tpl/purchaseDeliveryNote/deliveryToPut.html 0 → 100644
浏览文件 @ ad84f562
<!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/purchaseDeliveryNote/'}).use('deliveryToPut');
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/tpl/purchaseDeliveryNote/deliveryToQualityInspection.html 0 → 100644
浏览文件 @ ad84f562
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/tpl/purchaseDeliveryNote/purchaseDeliveryNoteList.html
浏览文件 @ ad84f562
......@@ -17,20 +17,32 @@
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
{{# if (d.editRow == 1) { }}
{{# if (auth('1718098162759')) { }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
{{# } }}
{{# if (auth('1718098062750')) { }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if (auth('1718098105613')) { }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# if (auth('1718098162759')) { }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
{{# } }}
{{# if (auth('1718098062750')) { }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if (auth('1718098105613')) { }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# } }}
{{# if (d.editRow == 2) { }}
{{# if (auth('1718098131815')) { }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# if (auth('1718098131815')) { }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# } }}
{{# if (d.state == 'pass' || d.state == 'partiallyCompleted') { }}
{{# if (d.otherState == 2 || d.otherState == 3) { }}
{{# if (auth('1718257557032')) { }}
<a class="layui-btn layui-btn-xs" lay-event="turnPurchase">转采购入库</a>
{{# } }}
{{# } }}
{{# if (d.qualityInspection == 2 || d.qualityInspection == 3) { }}
{{# if (auth('1718257115558')) { }}
<a class="layui-btn layui-btn-xs" lay-event="purchaseQualityInspection">转质检单</a>
{{# } }}
{{# } }}
{{# } }}
</script>
</div>
......
erp/src/main/resources/template/tpl/purchaseOrder/purchaseOrderList.html
浏览文件 @ ad84f562
......@@ -33,7 +33,7 @@
{{# } }}
{{# } }}
{{# if (d.state == 'pass' || d.state == 'partiallyCompleted') { }}
{{# if (d.otherState == '1') { }}
{{# if (d.otherState == 1) { }}
{{# if (auth('1571812784641')) { }}
<a class="layui-btn layui-btn-xs" lay-event="turnPurchase">转采购入库</a>
{{# } }}
......
erp/src/main/resources/template/tpl/purchaseQualityInspection/purchaseQualityInspectionList.html 0 → 100644
浏览文件 @ ad84f562
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>
\ No newline at end of file
web/src/main/resources/template/json/skyeyeClassEnum.json
浏览文件 @ ad84f562
......@@ -197,6 +197,6 @@
"carState": {"name": "TMS-车辆当前状态", "className": "skyeye-tms#com.skyeye.tms.car.classenum.CarState"},
"supplierContractChildStateEnum": {"name": "ERP-采购合同是否转采购订单状态", "className": "skyeye-erp#com.skyeye.contract.classenum.SupplierContractChildStateEnum"},
"orderQualityInspectionType": {"name": "ERP-采购订单质检状态", "className": "skyeye-erp#com.skyeye.business.classenum.OrderQualityInspectionType"}
"orderQualityInspectionType": {"name": "ERP-采购订单质检状态", "className": "skyeye-erp#com.skyeye.business.classenum.OrderQualityInspectionType"},
"deliveryPutState": {"name": "ERP-采购到货单免检商品入库状态", "className": "skyeye-erp#com.skyeye.purchase.classenum.DeliveryPutState"}
}
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或