Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

admin-assistant/src/main/resources/template/js/assetReportManage/assetReportUnUseChoose.js

@@ -16,8 +16,8 @@ layui.config({
 	var assetReportCheckType = isNull(parent.adminAssistantUtil.assetReportCheckType) ? false : parent.adminAssistantUtil.assetReportCheckType;
 
 	// 设置提示信息
-	var s = '资产明细选择规则：';
-	if(assetReportCheckType){
+	var s = '资产明细选择规则：仅加载未领用的资产信息。<br>';
+	if (assetReportCheckType) {
 		s += '1.多选；如没有查到要选择的资产信息，请检查资产信息是否满足当前规则。';
 		var ids = [];
 		$.each(parent.adminAssistantUtil.checkAssetReportMation, function(i, item) {

erp-produce/src/main/resources/template/js/erpPreProductionPlan/erpPreProductionPlanList.js

+
+var rowId = "";
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
+    winui.renderColor();
+    var $ = layui.$,
+        form = layui.form,
+        table = layui.table;
+
+    // 新增
+    authBtn('1720705272841');
+
+    table.render({
+        id: 'messageTable',
+        elem: '#messageTable',
+        method: 'post',
+        // 获取预生产计划单列表
+        url: sysMainMation.erpBasePath + 'queryProductionPlanList',
+        where: getTableParams(),
+        even: true,
+        page: true,
+        limits: getLimits(),
+        limit: getLimit(),
+        cols: [[
+            { title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
+            { field: 'oddNumber', title: '生产单号', align: 'center', rowspan: '2', width: 200, templet: function (d) {
+                    return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+                }},
+            { field: 'operTime', title: '单据日期', align: 'center', rowspan: '2', width: 140 },
+            { colspan: '2', title: '来源单据信息', align: 'center' },
+            { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) {
+                    return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
+                }},
+            { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
+                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
+                }},
+            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2',width: 120 },
+            { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', rowspan: '2',width: 150 },
+            { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', rowspan: '2',width: 120 },
+            { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', rowspan: '2',width: 150 },
+            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', rowspan: '2',width: 240, toolbar: '#tableBar'}
+        ],[
+            { field: 'fromTypeId', title: '来源类型', rowspan: '2',width: 150, templet: function (d) {
+                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sealOutLetFromType", 'id', d.fromTypeId, 'name');
+                }},
+            { field: 'fromId', title: '单据编号', rowspan: '2',width: 200, templet: function (d) {
+                    return getNotUndefinedVal(d.fromMation?.oddNumber);
+                }}
+        ]],
+        done: function(json) {
+            matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入生产单号", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
+        }
+    });
+
+    table.on('tool(messageTable)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+        if (layEvent === 'delete') { //删除
+            del(data, obj);
+        } else if (layEvent === 'edit') { //编辑
+            edit(data);
+        } else if (layEvent === 'details') { //详情
+            details(data);
+        } else if (layEvent === 'subApproval') { //提交审核
+            subApproval(data);
+        } else if (layEvent === 'processDetails') { // 工作流流程详情查看
+            activitiUtil.activitiDetails(data);
+        } else if (layEvent === 'revoke') { //撤销
+            revoke(data);
+        }
+    });
+
+    // 新增
+    $("body").on("click", "#addBean", function() {
+        _openNewWindows({
+            url:  systemCommonUtil.getUrl('FP2024071100001', null),
+            title: systemLanguage["com.skyeye.addPageTitle"][languageType],
+            pageId: "erpProductionAdd",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    });
+
+    // 编辑
+    function edit(data) {
+        _openNewWindows({
+            url:  systemCommonUtil.getUrl('FP2024071100002&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.editPageTitle"][languageType],
+            pageId: "erpProductionEdit",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    }
+
+    // 详情
+    function details(data) {
+        _openNewWindows({
+            url:  systemCommonUtil.getUrl('FP2024071100003&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+            pageId: "erpProductionDetail",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+            }});
+    }
+
+    // 删除
+    function del(data, obj) {
+        layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
+            layer.close(index);
+            AjaxPostUtil.request({url: sysMainMation.erpBasePath + "deleteProductionPlan", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
+                    winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
+                    loadTable();
+                }});
+        });
+    }
+
+    // 提交审批
+    function subApproval(data) {
+        layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
+            layer.close(index);
+            activitiUtil.startProcess(data.serviceClassName, null, function (approvalId) {
+                var params = {
+                    id: data.id,
+                    approvalId: approvalId
+                };
+                AjaxPostUtil.request({url: sysMainMation.erpBasePath + "submitProductionPlanToApproval", params: params, type: 'json', method: 'POST', callback: function (json) {
+                        winui.window.msg("提交成功", {icon: 1, time: 2000});
+                        loadTable();
+                    }});
+            });
+        });
+    }
+
+    // 撤销
+    function revoke(data) {
+        layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) {
+            layer.close(index);
+            AjaxPostUtil.request({url: sysMainMation.erpBasePath + "revokeProductionPlan", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
+                    winui.window.msg("提交成功", {icon: 1, time: 2000});
+                    loadTable();
+                }});
+        });
+    }
+
+    form.render();
+    $("body").on("click", "#reloadTable", function() {
+        loadTable();
+    });
+    function loadTable() {
+        table.reloadData("messageTable", {where: getTableParams()});
+    }
+
+    function getTableParams() {
+        return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
+    }
+
+    exports('erpPreProductionPlanList', {});
+});

erp-produce/src/main/resources/template/tpl/erpPreProductionPlan/erpPreProductionPlanList.html

+<!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 class="winui-toolbar">
+    <div class="winui-tool">
+        <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+        <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1590913527206"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+    </div>
+</div>
+<div style="margin:auto 10px;">
+    <table id="messageTable" lay-filter="messageTable"></table>
+    <script type="text/html" id="tableBar">
+        {{# if(d.editRow == 1) { }}
+            {{# if(auth('1720705286166')) { }}
+                <a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
+            {{# } }}
+            {{# if(auth('1590913527206')) { }}
+                <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
+            {{# } }}
+            {{# if(auth('1590926876459')) { }}
+                <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('1696246760629')) { }}
+                <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
+            {{# } }}
+        {{# } }}
+    </script>
+</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/erpPreProductionPlan/'}).use('erpPreProductionPlanList');
+</script>
+</body>
+</html>
\ No newline at end of file

erp-produce/src/main/resources/template/tpl/processOut/processOutList.html

+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file

erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutList.html

+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file

erp-produce/src/main/resources/template/tpl/workshopTaskArrangement/workshopTaskArrangementList.html

+<!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/salesOrder/salesOrderList.html

@@ -52,6 +52,11 @@
 					<a class="layui-btn layui-btn-xs" lay-event="turnReturns">转销售退货</a>
 				{{# } }}
 			{{# } }}
+			{{# if(d.state == 'partiallyCompleted') { }}
+				{{# if(auth('')){ }}
+					<a class="layui-btn layui-btn-xs" lay-event="turnReturns">转预生产计划</a>
+				{{# } }}
+			{{# } }}
 		</script>
 	</div>
 	<script src="../../assets/lib/layui/layui.js"></script>