diff --git a/erp-produce/src/main/resources/template/js/departmentMachining/departmentMachiningList.js b/erp-produce/src/main/resources/template/js/departmentMachining/departmentMachiningList.js index 6d114e73682185423145e7fe697f60dd04daed10..e48670a6004218bc2fb4d3f0834b519b4321ec8b 100644 --- a/erp-produce/src/main/resources/template/js/departmentMachining/departmentMachiningList.js +++ b/erp-produce/src/main/resources/template/js/departmentMachining/departmentMachiningList.js @@ -112,7 +112,7 @@ layui.config({ // 甘特图 function gantt(data) { _openNewWindows({ - url: "../../tpl/departmentMachining/machiningGantt.html?objectId=" + data.id + '&objectKey=' + data.serviceClassName, + url: "../../tpl/departmentMachining/machiningGantt.html?id=" + data.id, title: "车间任务安排甘特图", pageId: "machiningGantt", area: ['90vw', '90vh'], diff --git a/erp-produce/src/main/resources/template/js/departmentMachining/machiningGantt.js b/erp-produce/src/main/resources/template/js/departmentMachining/machiningGantt.js index d6542e1f05e816897a526f33942bb9e2b972e364..8f3ac86c25629d4aecb0f99090013c7ed88d8f01 100644 --- a/erp-produce/src/main/resources/template/js/departmentMachining/machiningGantt.js +++ b/erp-produce/src/main/resources/template/js/departmentMachining/machiningGantt.js @@ -1,5 +1,3 @@ -var objectKey = ""; -var objectId = ""; layui.config({ base: basePath, @@ -9,48 +7,37 @@ layui.config({ }).define(['window', 'jquery', 'winui', 'form', 'laydate'], function (exports) { winui.renderColor(); var $ = layui.$, - form = layui.form, - layer = layui.layer, - laydate = layui.laydate; - objectKey = GetUrlParam("objectKey"); - objectId = GetUrlParam("objectId"); - if (isNull(objectKey) || isNull(objectId)) { - winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000}); - return false; - } + form = layui.form; + var id = GetUrlParam("id"); - // 根据供应商id获取所有审批通过之后的里程碑列表 - let milestoneList = []; - AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryMachinById", params: {id: objectId}, type: 'json', method: 'GET', callback: function (json) { - $("#milestoneId").html(getDataUseHandlebars(getFileContent('tpl/template/select-option-must.tpl'), json)); - milestoneList = json.bean.machinChildList; - console.log(1,json) - console.log(2,milestoneList) - - // var authPermission = teamObjectPermissionUtil.checkTeamBusinessAuthPermission(objectId, 'taskAuthEnum'); - // var btnStr = `
`; - // var firstBtn = true; - // if (authPermission['list']) { - // var defaultClassName = firstBtn ? 'plan-select' : ''; - // firstBtn = false; - // btnStr += `` - // } - // if (authPermission['myExecute']) { - // var defaultClassName = firstBtn ? 'plan-select' : ''; - // firstBtn = false; - // btnStr += `` - // } - // if (authPermission['myCreate']) { - // var defaultClassName = firstBtn ? 'plan-select' : ''; - // btnStr += `` - // } - // btnStr += `
`; - // $(".txtcenter").before(btnStr); + // 根据id查询加工单信息 + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryMachinForGanttById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) { + console.log(json) matchingLanguage(); form.render(); renderPanel(); - render(); + // render(); + + gantt.clearAll(); //清空缓存 + let nodeList = json.bean.node; + if (isNull(nodeList) || nodeList.length == 0) { + return; + } + $.each(nodeList, function (i, item) { + item.start_date = new Date(item.start_date); + item.end_date = new Date(item.end_date); + }); + let linkList = json.bean.link; + if (isNull(linkList) || linkList.length == 0) { + linkList = []; + } + // 解析 + gantt.parse({ + data: nodeList, + links: linkList + }); + }}); function renderPanel() { @@ -140,44 +127,43 @@ layui.config({ gantt.init("device_load"); gantt.i18n.setLocale("cn"); //使用中文 - function render() { - let milestoneId = $("#milestoneId").val(); - if (isNull(milestoneId)) { - winui.window.msg("请选择产品", {icon: 2, time: 2000}); - return false; - } - let params = { - id: objectId, - // objectKey: objectKey, - // holderId: milestoneId, - // type: $("#type .plan-select").attr("data-type") - }; - var tem = getInPoingArr(milestoneList, "id", milestoneId, null); - gantt.config.start_date = new Date(tem.startTime); - gantt.config.end_date = new Date(tem.endTime); - console.log(999) - AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryMachinForGanttById", params: params, type: 'json', method: 'GET', callback: function (json) { - console.log(88,json) - gantt.clearAll(); //清空缓存 - let nodeList = json.bean.node; - if (isNull(nodeList) || nodeList.length == 0) { - return; - } - $.each(nodeList, function (i, item) { - item.start_date = new Date(item.start_date); - item.end_date = new Date(item.end_date); - }); - let linkList = json.bean.link; - if (isNull(linkList) || linkList.length == 0) { - linkList = []; - } - // 解析 - gantt.parse({ - data: nodeList, - links: linkList - }); - }}); - } + // function render() { + // let milestoneId = $("#milestoneId").val(); + // if (isNull(milestoneId)) { + // winui.window.msg("请选择产品", {icon: 2, time: 2000}); + // return false; + // } + // let params = { + // id: objectId, + // // objectKey: objectKey, + // // holderId: milestoneId, + // // type: $("#type .plan-select").attr("data-type") + // }; + // var tem = getInPoingArr(milestoneList, "id", milestoneId, null); + // gantt.config.start_date = new Date(tem.startTime); + // gantt.config.end_date = new Date(tem.endTime); + // console.log(999) + // AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryMachinForGanttById", params: params, type: 'json', method: 'GET', callback: function (json) { + // gantt.clearAll(); //清空缓存 + // let nodeList = json.bean.node; + // if (isNull(nodeList) || nodeList.length == 0) { + // return; + // } + // $.each(nodeList, function (i, item) { + // item.start_date = new Date(item.start_date); + // item.end_date = new Date(item.end_date); + // }); + // let linkList = json.bean.link; + // if (isNull(linkList) || linkList.length == 0) { + // linkList = []; + // } + // // 解析 + // gantt.parse({ + // data: nodeList, + // links: linkList + // }); + // }}); + // } $("body").on("click", ".type-btn", function (e) { $(this).parent().find('.type-btn').removeClass("plan-select"); diff --git a/erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js b/erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js new file mode 100644 index 0000000000000000000000000000000000000000..927b8f3738a2ebce58edb23976804b5c534a311f --- /dev/null +++ b/erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js @@ -0,0 +1,44 @@ + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'jquery', 'winui', 'form', 'textool'], function (exports) { + winui.renderColor(); + var index = parent.layer.getFrameIndex(window.name); + var $ = layui.$, + textool = layui.textool, + form = layui.form; + var id = getNotUndefinedVal(GetUrlParam("id")); + + textool.init({ + eleId: 'barCode', + tools: ['copy', 'reset', 'clear'] + }); + + matchingLanguage(); + form.render(); + form.on('submit(getBean)', function (data) { + if (winui.verifyForm(data.elem)) { + let params = { + id: id, + realNumber: $("#realNumber").val(), + profitNum: $("#profitNum").val(), + lossNum: $("#lossNum").val(), + } + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "complateInventoryChild", params: params, type: 'json', method: 'POST', callback: function (json) { + parent.layer.close(index); + parent.refreshCode = '0'; + }}); + } + return false; + }); + + $("body").on("click", "#cancle", function() { + parent.layer.close(index); + }); +}); + + + diff --git a/erp/src/main/resources/template/js/inventoryTaskList/inventoryTaskList.js b/erp/src/main/resources/template/js/inventoryTaskList/inventoryTaskList.js new file mode 100644 index 0000000000000000000000000000000000000000..49ce62fe556cb677316fc230796ecc18a2ac0873 --- /dev/null +++ b/erp/src/main/resources/template/js/inventoryTaskList/inventoryTaskList.js @@ -0,0 +1,162 @@ + +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; + var serviceClassName = sysServiceMation["inventoryOrder"]["key"]; + authBtn('1718282987406');//新增 + + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.erpBasePath + 'queryInventoryList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2' }, + { field: 'oddNumber', title: '单号', width: 200, align: 'center', templet: function (d) { + return '' + d.oddNumber + ''; + }}, + { field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 }, + { field: 'inventoryNum', title: '已盘点数量', rowspan: '2', align: 'center', width: 140 }, + { field: 'allNum', title: '盘点总数量', rowspan: '2', align: 'center', width: 140 }, + { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) { + return '' + getNotUndefinedVal(d.processInstanceId) + ''; + }}, + { field: 'state', title: '状态', width: 90, align: 'center', 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], rowspan: '2', align: 'center', width: 150 }, + { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 }, + { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], rowspan: '2', align: 'center', width: 150 }, + { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} + ]], + 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') { //删除 + delet(data); + } else if (layEvent === 'details') { //详情 + details(data); + } else if (layEvent === 'edit') { //编辑 + edit(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('FP2024071800001', null), + title: systemLanguage["com.skyeye.addPageTitle"][languageType], + pageId: "inventoryTaskListAdd", + 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('FP2024071800002&id=' + data.id, null), + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "inventoryTaskListEdit", + 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('FP2024071800003&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "inventoryTaskListDetails", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + }}); + } + + // 提交审批 + 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(serviceClassName, null, function (approvalId) { + var params = { + id: data.id, + approvalId: approvalId + }; + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "submitInventoryToApproval", params: params, type: 'json', method: 'POST', callback: function (json) { + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + }); + } + + // 删除 + function delet(data) { + 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 + "deleteInventory", params: {id: data.id}, type: 'json', method: "POST", callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + + // 撤销 + function revoke(data) { + layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "revokeInventory", 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('inventoryTaskList', {}); +}); diff --git a/erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js b/erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js new file mode 100644 index 0000000000000000000000000000000000000000..73be27cd73e1bc6d7f84d627c7ad303d2e2bb875 --- /dev/null +++ b/erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js @@ -0,0 +1,100 @@ + +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; + + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.erpBasePath + 'queryInventoryChildList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2' }, + { field: 'oddNumber', title: '单号', width: 200, align: 'center', templet: function (d) { + return '' + d.oddNumber + ''; + }}, + // { field: 'operatorId', title: '产品', rowspan: '2', align: 'center', width: 140 }, + // { field: 'normsId', title: '规格', rowspan: '2', align: 'center', width: 140 }, + // { field: 'depotId', title: '仓库', rowspan: '2', align: 'center', width: 140 }, + + { field: 'materialId', title: '产品名称', align: 'left', width: 150, templet: function (d) { + return getNotUndefinedVal(d.materialMation?.name); + }}, + { field: 'normsId', title: '产品规格', align: 'left', width: 150, templet: function (d) { + return getNotUndefinedVal(d.normsMation?.name); + }}, + { field: 'depotId', title: "仓库", align: 'left', width: 150, templet: function (d) { + return getNotUndefinedVal(d.depotMation?.name); + }}, + + { field: 'planStartTime', title: '计划开始时间', rowspan: '2', align: 'center', width: 140 }, + { field: 'planEndTime', title: '计划结束时间', rowspan: '2', align: 'center', width: 140 }, + { field: 'lossNum', title: '盘亏数量', rowspan: '2', align: 'center', width: 140 }, + { field: 'realNumber', title: '实际盘点数量', rowspan: '2', align: 'center', width: 140 }, + { field: 'profitNum', title: '盘盈数量', rowspan: '2', align: 'center', width: 140 }, + { field: 'planNumber', title: '盘点总数量', rowspan: '2', align: 'center', width: 140 }, + { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); + }}, + { field: 'type', title: '类型', width: 90, align: 'center', templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("materialNormsCodeType", 'id', d.type, 'name'); + }}, + { field: 'unitPrice', title: '单价', rowspan: '2', align: 'center', width: 140 }, + { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} + ]], + 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 === 'complete') { //删除 + complete(data); + } + }); + + // 完成 + function complete(data) { + _openNewWindows({ + url: "../../tpl/inventoryTaskList/complateInventoryChild.html?id=" + data.id, + title: "盘点完成", + pageId: "complateInventoryChild", + 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(); + }); + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('inventoryTaskList', {}); +}); diff --git a/erp/src/main/resources/template/js/turnIocatorManage/batchAdd.js b/erp/src/main/resources/template/js/turnIocatorManage/batchAdd.js index a8c3f61d7bc0821dde43852d58d52661eb74cf85..fa95e55009a78bb0274a847c58569d058132e078 100644 --- a/erp/src/main/resources/template/js/turnIocatorManage/batchAdd.js +++ b/erp/src/main/resources/template/js/turnIocatorManage/batchAdd.js @@ -27,9 +27,8 @@ layui.config({ let params = { parentId: parentId, depotId: depotId, - // type: $("#type").val(), - type: $("#type input:radio:checked").val(), - number:$("#number").val(), + type: dataShowType.getData('type'), + number: $("#number").val(), } AjaxPostUtil.request({url: sysMainMation.erpBasePath + "batchGenerateDepotLevelVal", params: params, type: 'json', method: 'POST', callback: function (json) { parent.layer.close(index); diff --git a/erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js b/erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js index e39e84fbfd54cddb67d2a128f78432a373de235e..8c70a55a7cfe11a824633aeb6c97a62e51d21b6d 100644 --- a/erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js +++ b/erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js @@ -1,8 +1,3 @@ - -var rowId = ""; - -var parentNode = null; - layui.config({ base: basePath, version: skyeyeVersion @@ -78,7 +73,7 @@ layui.config({ ]], done: function (json) { matchingLanguage(); - initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入编号", function () { + initTableSearchUtil.initAdvancedSearch($("#messageTable")[0], json.searchFilter, form, "请输入编号", function () { tableTree.reload("messageTable", {page: {curr: 1}, where: getTableParams()}); }); } diff --git a/erp/src/main/resources/template/js/warehousePersonnel/warehousePersonnel.js b/erp/src/main/resources/template/js/warehousePersonnel/warehousePersonnel.js new file mode 100644 index 0000000000000000000000000000000000000000..cb2f160ab54799b9189abbc3e19d41bc1372b1bf --- /dev/null +++ b/erp/src/main/resources/template/js/warehousePersonnel/warehousePersonnel.js @@ -0,0 +1,133 @@ +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('1721305232197'); + + loadWareshop(); + + form.render(); + var chooseWorkshopId = ""; + function loadWareshop() { + table.render({ + id: 'warehouseTable', + elem: '#warehouseTable', + method: 'get', + url: sysMainMation.erpBasePath + 'queryStaffBelongDepotList', + even: false, + page: false, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], fixed: 'left', type: 'numbers' }, + { field: 'name', title: '仓库', align: 'left', width: 150, templet: function (d) { + return '' + d.name + ''; + }} + ]], + done: function(json) { + matchingLanguage(); + depotId = ""; + loadStaff(""); + } + }); + table.on('tool(warehouseTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent == 'select') { + depotId = data.id; + loadStaff(data.id); + } + }); + } + + function loadStaff(depotId) { + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.erpBasePath + 'queryDepotStaffList', + where: {objectId: depotId}, + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], fixed: 'left', type: 'numbers' }, + { field: 'jobNumber', title: '工号', align: 'left', width: 140, templet: function (d) { + return getNotUndefinedVal(d.staffMation?.jobNumber); + }}, + { field: 'userName', title: '姓名', width: 120, templet: function (d) { + return getNotUndefinedVal(d.staffMation?.userName); + }}, + { field: 'companyName', title: '企业', width: 150, templet: function (d) { + return getNotUndefinedVal(d.staffMation?.companyName); + }}, + { field: 'departmentName', title: '部门', width: 140, templet: function (d) { + return getNotUndefinedVal(d.staffMation?.departmentName); + }}, + { field: 'jobName', title: '职位', width: 140, templet: function (d) { + return getNotUndefinedVal(d.staffMation?.jobName); + }}, + { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'} + ]], + done: function(json) { + matchingLanguage(); + } + }); + + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'delete') { // 删除 + delet(data); + } + }); + } + + // 删除 + function delet(data) { + 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 + "deleteDepotStaffById", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); + table.reloadData("messageTable", {page: {curr: 1}, where: {objectId: depotId}}) + }}); + }); + } + + // 添加 + $("body").on("click", "#addBean", function() { + if (isNull(depotId)) { + winui.window.msg('请先选择仓库信息.', {icon: 2, time: 2000}); + return false; + } + systemCommonUtil.userStaffCheckType = true; // // 人员选择类型，1.多选；其他。单选 + systemCommonUtil.checkStaffMation = []; // 选择时返回的对象 + systemCommonUtil.openSysAllUserStaffChoosePage(function (checkStaffMation) { + var list = new Array(); + console.log(checkStaffMation) + $.each(checkStaffMation, function (i, item) { + list.push(item.id); + }); + console.log(list) + var params = { + depotId: depotId, + staffId: JSON.stringify(list) + }; + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertDepotStaff", params: params, type: 'json', method: "POST", callback: function (json) { + loadStaff(depotId); + }}); + }); + + }); + + exports('warehousePersonnel', {}); +}); diff --git a/erp/src/main/resources/template/tpl/inventoryTaskList/complateInventoryChild.html b/erp/src/main/resources/template/tpl/inventoryTaskList/complateInventoryChild.html new file mode 100644 index 0000000000000000000000000000000000000000..8a474c1d397ae75003cf37f1eb230fa14ace6a2a --- /dev/null +++ b/erp/src/main/resources/template/tpl/inventoryTaskList/complateInventoryChild.html @@ -0,0 +1,49 @@ + + + + + + + + +
+
+
+ 基本信息
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ + +
+
+
+
+ + + + + + \ No newline at end of file diff --git a/erp/src/main/resources/template/tpl/inventoryTaskList/inventoryTaskList.html b/erp/src/main/resources/template/tpl/inventoryTaskList/inventoryTaskList.html new file mode 100644 index 0000000000000000000000000000000000000000..9b89b17cab66a2d5a0bd7f1f02eb86e13394d896 --- /dev/null +++ b/erp/src/main/resources/template/tpl/inventoryTaskList/inventoryTaskList.html @@ -0,0 +1,43 @@ + + + + + + + + + +
+
+ + +
+
+
+
+ +
+ + + + + \ No newline at end of file diff --git a/erp/src/main/resources/template/tpl/inventoryTaskList/myTaskInventoryList.html b/erp/src/main/resources/template/tpl/inventoryTaskList/myTaskInventoryList.html new file mode 100644 index 0000000000000000000000000000000000000000..71f08d32c3f655ef378ee68e27138dfe668d8270 --- /dev/null +++ b/erp/src/main/resources/template/tpl/inventoryTaskList/myTaskInventoryList.html @@ -0,0 +1,29 @@ + + + + + + + + + +
+
+ +
+
+
+
+ +
+ + + + + \ No newline at end of file diff --git a/erp/src/main/resources/template/tpl/warehousePersonnel/warehousePersonnel.html b/erp/src/main/resources/template/tpl/warehousePersonnel/warehousePersonnel.html new file mode 100644 index 0000000000000000000000000000000000000000..46f2220d597cc115d6f3de0c4e5ad86b2df77e8f --- /dev/null +++ b/erp/src/main/resources/template/tpl/warehousePersonnel/warehousePersonnel.html @@ -0,0 +1,53 @@ + + + + + + + + + +
+
+
+
+
+
仓库
+
+
+
+
+
+ +
+
+
员工
+
+
+
+ +
+
+
+
+ + +
+
+
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/pro/src/main/resources/template/js/proTask/taskGantt.js b/pro/src/main/resources/template/js/proTask/taskGantt.js index 088b73cfc90d9d6f65d9aa3da1737908f4f7e897..67b81ce7ee3215661b9f9e29d8c92479e76fcf99 100644 --- a/pro/src/main/resources/template/js/proTask/taskGantt.js +++ b/pro/src/main/resources/template/js/proTask/taskGantt.js @@ -24,8 +24,6 @@ layui.config({ AjaxPostUtil.request({url: sysMainMation.projectBasePath + "queryAllApprovalMilestoneList", params: {objectId: objectId}, type: 'json', method: 'GET', callback: function (json) { $("#milestoneId").html(getDataUseHandlebars(getFileContent('tpl/template/select-option-must.tpl'), json)); milestoneList = json.rows; - console.log(123,json.rows) - console.log(456,milestoneList) var authPermission = teamObjectPermissionUtil.checkTeamBusinessAuthPermission(objectId, 'taskAuthEnum'); var btnStr = `
`; diff --git a/web/src/main/resources/template/json/sysServiceMation.json b/web/src/main/resources/template/json/sysServiceMation.json index 6551f66ff4764d0b5d7e6c59c1d7efe9a9a71160..013663c0bfe3109f37a8dcd9a3e498b218fef867 100644 --- a/web/src/main/resources/template/json/sysServiceMation.json +++ b/web/src/main/resources/template/json/sysServiceMation.json @@ -17,6 +17,7 @@ "allocationFormOrder": {"name": "调拨订单", "key": "com.skyeye.other.service.impl.AllocationServiceImpl"}, "depotOutOrder": {"name": "仓库出库单", "key": "com.skyeye.depot.service.impl.DepotOutServiceImpl"}, "depotPutOrder": {"name": "仓库入库单", "key": "com.skyeye.depot.service.impl.DepotPutServiceImpl"}, + "inventoryOrder": {"name": "盘点任务单", "key": "com.skyeye.inventory.service.impl.InventoryServiceImpl"}, "putAcceptanceWarehousing": {"name": "验收入库单", "key": "com.skyeye.machin.service.impl.ErpAcceptanceReceiptServiceImpl"}, "machinHeader": {"name": "加工单", "key": "com.skyeye.machin.service.impl.ErpMachinServiceImpl"},