diff --git a/erp/src/main/resources/template/js/depotOut/list.js b/erp/src/main/resources/template/js/depotOut/list.js index 27919c52ca7966a5657e28c989a8898b1650a1d5..021ecbbcc2c7b0a20a67329cabb97a6434aa3bde 100644 --- a/erp/src/main/resources/template/js/depotOut/list.js +++ b/erp/src/main/resources/template/js/depotOut/list.js @@ -23,28 +23,33 @@ layui.config({ limits: getLimits(), limit: getLimit(), cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'oddNumber', title: '单据单号', align: 'left', width: 220, templet: function (d) { + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' ,rowspan: '2'}, + { field: 'oddNumber', title: '单据单号', align: 'left', width: 220,rowspan: '2', templet: function (d) { var str = '' + d.oddNumber + ''; if (!isNull(d.fromId)) { str += '[转]'; } return str; }}, - { field: 'fromTypeId', title: '来源单据类型', width: 120, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutFromType", 'id', d.fromTypeId, 'name'); - }}, - { field: 'createName', title: '申请人', width: 120 }, - { field: 'createTime', title: '申请时间', align: 'center', width: 150 }, - { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 }, - { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, - { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { + { colspan: '2', title: '来源单据信息', align: 'center' }, + { field: 'createName', title: '申请人', width: 120,rowspan: '2' }, + { field: 'createTime', title: '申请时间', align: 'center', width: 150 ,rowspan: '2'}, + { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 ,rowspan: '2'}, + { field: 'operTime', title: '单据日期', align: 'center', width: 140 ,rowspan: '2'}, + { field: 'state', title: '状态', rowspan: '2', width: 90,rowspan: '2', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); }}, - { field: 'otherState', title: '确认状态', width: 90, templet: function (d) { + { field: 'otherState', title: '确认状态', width: 90,rowspan: '2', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutOtherState", 'id', d.otherState, 'name'); }}, { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} + ], [ + { field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutFromType", 'id', d.fromTypeId, 'name'); + }}, + { field: 'fromId', title: '单据编号', width: 200, templet: function (d) { + return getNotUndefinedVal(d.fromMation?.oddNumber); + }} ]], done: function(json) { matchingLanguage(); diff --git a/erp/src/main/resources/template/js/depotOut/transList.js b/erp/src/main/resources/template/js/depotOut/transList.js index 8039d68ffc6ae986bec043c762919524744d1666..8bc574e2e7507b0590cf7971494f575b60aca940 100644 --- a/erp/src/main/resources/template/js/depotOut/transList.js +++ b/erp/src/main/resources/template/js/depotOut/transList.js @@ -95,6 +95,9 @@ layui.config({ } else if (type == 6) { // 补料出库单 pageUrl = 'FP2024070100002'; + } else if (type == 7) { + // 补料出库单 + pageUrl = 'FP2023091000003'; } _openNewWindows({ url: systemCommonUtil.getUrl(pageUrl +'&id=' + data.id, null), @@ -127,6 +130,9 @@ layui.config({ } else if (type == 6) { // 补料出库单 pageUrl = '../../tpl/erpPick/erpPatchPickToOut.html'; + } else if (type == 7) { + // 配件申领出库单 + pageUrl = '../../tpl/sealApply/sealApplyToOut.html'; } _openNewWindows({ url: pageUrl + '?id=' + data.id, diff --git a/erp/src/main/resources/template/js/depotPut/list.js b/erp/src/main/resources/template/js/depotPut/list.js index f5864c510dbf201d279120cf3cf3cc3bf44d1c5b..06ec9401b7db1ac8b245f68080e274103639f507 100644 --- a/erp/src/main/resources/template/js/depotPut/list.js +++ b/erp/src/main/resources/template/js/depotPut/list.js @@ -23,28 +23,33 @@ layui.config({ limits: getLimits(), limit: getLimit(), cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'oddNumber', title: '单据单号', align: 'left', width: 220, templet: function (d) { + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers',rowspan: '2' }, + { field: 'oddNumber', title: '单据单号', align: 'left', width: 220,rowspan: '2', templet: function (d) { var str = '' + d.oddNumber + ''; if (!isNull(d.fromId)) { str += '[转]'; } return str; }}, - { field: 'idKey', title: '来源单据类型', width: 120, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotPutFromType", 'id', d.fromTypeId, 'name'); - }}, - { field: 'createName', title: '申请人', width: 120 }, - { field: 'createTime', title: '申请时间', align: 'center', width: 150 }, - { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 }, - { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, - { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { + { colspan: '2', title: '来源单据信息', align: 'center' }, + { field: 'createName', title: '申请人', width: 120 ,rowspan: '2'}, + { field: 'createTime', title: '申请时间', align: 'center', width: 150 ,rowspan: '2'}, + { field: 'totalPrice', title: '合计金额', align: 'left', width: 120,rowspan: '2' }, + { field: 'operTime', title: '单据日期', align: 'center', width: 140,rowspan: '2' }, + { field: 'state', title: '状态', rowspan: '2', width: 90,rowspan: '2', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); }}, - { field: 'otherState', title: '入库状态', width: 90, templet: function (d) { + { field: 'otherState', title: '入库状态', width: 90,rowspan: '2', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotPutState", 'id', d.otherState, 'name'); }}, - { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} + { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar',rowspan: '2'} + ], [ + { field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotPutFromType", 'id', d.fromTypeId, 'name'); + }}, + { field: 'fromId', title: '单据编号', width: 200, templet: function (d) { + return getNotUndefinedVal(d.fromMation?.oddNumber); + }} ]], done: function(json) { matchingLanguage(); diff --git a/erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js b/erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js index eabe2c51fe406ed8553716dec6eb445c767cda30..347f0af6faac9dfc3cc5d2a263417b4d7be8c731 100644 --- a/erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js +++ b/erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js @@ -25,7 +25,7 @@ layui.config({ } }); - + //获取的条形码是入库状态的 tableSelect.render({ elem: '#code', //定义输入框input对象 checkedKey: 'id', //表格的唯一键值，非常重要，影响到选中状态 必填 @@ -43,10 +43,6 @@ layui.config({ { field: 'codeNum', title: '条形码', width: 250, templet: function (d) { return '' + d.codeNum + ''; }}, - // { field: 'userName', title: '员工姓名', width: 100 }, - // { field: 'userSex', title: '性别', width: 60, rowspan: '2', templet: function (d) { - // return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sexEnum", 'id', d.userSex, 'name'); - // }}, ]] }, done: function (elem, data) { diff --git a/erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js b/erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js index daa57bd7afdb7407572ebd4e725b9876aab6b14d..f43034383e62cfa66d4075317472cb79c248512f 100644 --- a/erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js +++ b/erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js @@ -40,7 +40,7 @@ layui.config({ { 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) { + { field: 'state', title: '状态', width: 150, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("inventoryChildState", 'id', d.state, 'name'); }}, { field: 'type', title: '类型', width: 90, align: 'center', templet: function (d) { diff --git a/erp/src/main/resources/template/js/warehousePersonnel/warehousePersonnel.js b/erp/src/main/resources/template/js/warehousePersonnel/warehousePersonnel.js index 126830a0671a751898255252f973c318b6113663..34b9baf1da571d9c04afbee22b307f6f8cc4d8b0 100644 --- a/erp/src/main/resources/template/js/warehousePersonnel/warehousePersonnel.js +++ b/erp/src/main/resources/template/js/warehousePersonnel/warehousePersonnel.js @@ -14,13 +14,14 @@ layui.config({ loadWareshop(); + //获取当前登录用户管理的仓库列表 form.render(); function loadWareshop() { table.render({ id: 'warehouseTable', elem: '#warehouseTable', method: 'get', - url: sysMainMation.erpBasePath + 'queryStaffBelongDepotList', + url: sysMainMation.erpBasePath + 'storehouse009', even: false, page: false, limits: getLimits(), diff --git a/seal-service/src/main/resources/template/js/sealApply/sealApplyToOut.js b/seal-service/src/main/resources/template/js/sealApply/sealApplyToOut.js new file mode 100644 index 0000000000000000000000000000000000000000..cd4816a89875ae63a60849db3cfa0899508307d0 --- /dev/null +++ b/seal-service/src/main/resources/template/js/sealApply/sealApplyToOut.js @@ -0,0 +1,55 @@ + +// 以下两个参数开启团队权限时有值 +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 + "queryOtherWiseOrderTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) { + let data = json.bean; + // 仓库出库的【编辑布局】 + console.log(data) + dsFormUtil.initEditPageForStatic('content', 'FP2024070100006', data, { + savePreParams: function (params) { + params.farmId=data.farmId + params.departmentId=data.departmentId + params.salesman=data.salesman + }, + saveData: function (params) { + // 保存数据 + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertOtherWiseOrderToDepotOut", params: params, type: 'json', method: "POST", callback: function(json) { + parent.layer.close(index); + parent.refreshCode = '0'; + }}); + }, + loadComponentCallback: function () { + $("div[controlType='correspondentAllEnter']").remove(); + $("div[controlType='depotOutFromType']").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); + $("div[controlType='simpleTable']").find(".warehouse").prop('disabled', true); + } + }); + }}); + +}); \ No newline at end of file diff --git a/seal-service/src/main/resources/template/tpl/sealApply/sealApplyToOut.html b/seal-service/src/main/resources/template/tpl/sealApply/sealApplyToOut.html new file mode 100644 index 0000000000000000000000000000000000000000..07805494259c3be6e651b36780ec15ae46a6823d --- /dev/null +++ b/seal-service/src/main/resources/template/tpl/sealApply/sealApplyToOut.html @@ -0,0 +1,29 @@ + + + + + + + + + +
+
+
+
+
+ + ` + +
+
+
+
+ + + + + + \ No newline at end of file