diff --git a/erp/src/main/resources/template/js/purchaseOrder/purchaseOrderList.js b/erp/src/main/resources/template/js/purchaseOrder/purchaseOrderList.js index f5065b98dd057985b46408d5e4eb94ef07c31e20..3907a8c00356f72d0e9a79ed6913cb70403f239d 100644 --- a/erp/src/main/resources/template/js/purchaseOrder/purchaseOrderList.js +++ b/erp/src/main/resources/template/js/purchaseOrder/purchaseOrderList.js @@ -38,7 +38,7 @@ layui.config({ return '' + d.processInstanceId + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); }}, { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 }, { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 }, diff --git a/erp/src/main/resources/template/js/salesOrder/salesOrderChoose.js b/erp/src/main/resources/template/js/salesOrder/salesOrderChoose.js index 01e509be70627e51efdff7ffd59781c7b8ae3f87..18259a5c0f23756440a856f6e862786a5d4197c8 100644 --- a/erp/src/main/resources/template/js/salesOrder/salesOrderChoose.js +++ b/erp/src/main/resources/template/js/salesOrder/salesOrderChoose.js @@ -17,7 +17,7 @@ layui.config({ var materialCategoryType; fsTree.render({ id: "materialCategoryType", - url: flowableBasePath + "salesorder011", + url: sysMainMation.erpBasePath + "salesorder011", checkEnable: false, loadEnable: false,//异步加载 showLine: false, @@ -67,7 +67,7 @@ layui.config({ id: 'messageTable', elem: '#messageTable', method: 'post', - url: flowableBasePath + 'salesorder012', + url: sysMainMation.erpBasePath + 'salesorder012', where: getTableParams(), even: true, page: false, diff --git a/erp/src/main/resources/template/js/salesOrder/salesOrderList.js b/erp/src/main/resources/template/js/salesOrder/salesOrderList.js index 77612b1dfb8afda11507958115d71d921c54ae14..4c50b84d9d87536f6d10a839eb3dee5013966fac 100644 --- a/erp/src/main/resources/template/js/salesOrder/salesOrderList.js +++ b/erp/src/main/resources/template/js/salesOrder/salesOrderList.js @@ -38,7 +38,7 @@ layui.config({ return '' + d.processInstanceId + ''; }}, { field: 'state', title: '状态', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); }}, { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 }, { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 }, diff --git a/erp/src/main/resources/template/js/salesOutlet/salesOutletAdd.js b/erp/src/main/resources/template/js/salesOutlet/salesOutletAdd.js deleted file mode 100644 index 589c1c21f87cd64dd8a613d922743d17fd190abc..0000000000000000000000000000000000000000 --- a/erp/src/main/resources/template/js/salesOutlet/salesOutletAdd.js +++ /dev/null @@ -1,246 +0,0 @@ - -// 根据那一列的值进行变化,默认根据数量 -var showTdByEdit = 'rkNum'; - -// 兼容动态表单 -var layedit, form; - -// 销售出库单 -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'jquery', 'winui', 'laydate', 'textool', 'tagEditor'].concat(dsFormUtil.mastHaveImport), function(exports) { - winui.renderColor(); - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - laydate = layui.laydate, - textool = layui.textool; - layedit = layui.layedit, - form = layui.form; - var serviceClassName = sysServiceMation["outIsSalesOutlet"]["key"]; - - var inoutitemHtml = "";//支出项目 - var salesManList = new Array();//销售人员 - - var selOption = getFileContent('tpl/template/select-option.tpl'); - // 已经选择的商品集合key：表格的行trId，value：商品信息 - var allChooseProduct = {}; - - // 获取单据提交类型 - var submitType = erpOrderUtil.getSubmitTypeByKey(serviceClassName); - - // 单据时间 - laydate.render({elem: '#operTime', type: 'datetime', value: getFormatDate(), trigger: 'click'}); - - textool.init({eleId: 'remark', maxlength: 200}); - - // 初始化账户 - systemCommonUtil.getSysAccountListByType(function (json) { - // 加载账户数据 - $("#accountId").html(getDataUseHandlebars(selOption, json)); - }); - - // 初始化支出项目 - systemCommonUtil.getSysInoutitemListByType(2, function (json) { - // 加载支出项目 - inoutitemHtml = getDataUseHandlebars(selOption, json); - }); - - // 初始化仓库 - erpOrderUtil.getDepotList(function (json){ - // 加载仓库数据 - $("#depotId").html(getDataUseHandlebars(selOption, json)); - }); - - // 商品 - initTableChooseUtil.initTable({ - id: "productList", - cols: [ - {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, - {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, - {id: 'allStock', title: '库存', formType: 'detail', width: '80'}, - {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, - {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, - {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, - {id: 'taxRate', title: '税率(%)', formType: 'input', width: '80', className: 'change-input taxRate', verify: 'required|double', value: '0.00'}, - {id: 'taxMoney', title: '税额', formType: 'input', width: '80', className: 'change-input taxMoney', verify: 'required|money'}, - {id: 'taxUnitPrice', title: '含税单价', formType: 'input', width: '80', className: 'change-input taxUnitPrice', verify: 'required|money'}, - {id: 'taxLastMoney', title: '合计价税', formType: 'input', width: '80', className: 'change-input taxLastMoney', verify: 'required|money'}, - {id: 'remark', title: '备注', formType: 'input', width: '100'} - ], - deleteRowCallback: function (trcusid) { - delete allChooseProduct[trcusid]; - // 计算价格 - calculatedTotalPrice(); - }, - addRowCallback: function (trcusid) { - // 设置根据某列变化的颜色 - $("." + showTdByEdit).parent().css({'background-color': '#e6e6e6'}); - }, - form: form, - minData: 1 - }); - - // 其他费用 - initTableChooseUtil.initTable({ - id: "otherPriceTableList", - cols: [ - {id: 'inoutitemId', title: '支出项目', formType: 'select', width: '120', verify: 'required', modelHtml: inoutitemHtml}, - {id: 'otherPrice', title: '费用合计：0.00', formType: 'input', width: '120', className: 'otherPrice', verify: 'required|money', colHeaderId: 'otherPriceTotal'} - ], - deleteRowCallback: function (trcusid) { - calculationPrice(); - }, - addRowCallback: function (trcusid) { - calculationPrice(); - }, - form: form - }); - - // 加载动态表单 - dsFormUtil.loadPageByCode("dsFormShow", serviceClassName, null); - - matchingLanguage(); - - // 商品规格加载变化事件 - mUnitChangeEvent(form, allChooseProduct, "salePrice"); - - // 仓库变化事件 - form.on('select(depotId)', function(data) { - loadMaterialDepotStockByDepotId(data.value); - }); - - // 保存为草稿 - form.on('submit(formAddBean)', function(data) { - if(winui.verifyForm(data.elem)) { - saveData("1", ""); - } - return false; - }); - - // 走工作流的提交审批 - form.on('submit(formSubOneBean)', function(data) { - if(winui.verifyForm(data.elem)) { - activitiUtil.startProcess(serviceClassName, null, function (approvalId) { - saveData("2", approvalId); - }); - } - return false; - }); - - // 不走工作流的提交 - form.on('submit(formSubTwoBean)', function(data) { - if(winui.verifyForm(data.elem)) { - saveData("2", ""); - } - return false; - }); - - function saveData(subType, approvalId) { - var result = initTableChooseUtil.getDataList('productList'); - if (!result.checkResult) { - return false; - } - var noError = false; - var tableData = []; - $.each(result.dataList, function(i, item) { - //获取行编号 - var thisRowKey = item["trcusid"].replace("tr", ""); - if (parseInt(item.rkNum) == 0) { - $("#rkNum" + thisRowKey).addClass("layui-form-danger"); - $("#rkNum" + thisRowKey).focus(); - winui.window.msg('数量不能为0', {icon: 2, time: 2000}); - noError = true; - return false; - } - //商品对象 - var material = allChooseProduct["tr" + thisRowKey]; - if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) { - winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000}); - noError = true; - return false; - } - item["materialId"] = material.materialId; - item["depotId"] = $("#depotId").val(); - tableData.push(item); - }); - if (noError) { - return false; - } - - // 其他费用 - var otherPriceResult = initTableChooseUtil.getDataList('otherPriceTableList'); - var otherMoney = 0; - $.each(otherPriceResult.dataList, function(i, item) { - otherMoney += parseFloat(isNull(item.otherPrice) ? 0 : item.otherPrice); - }); - - var salesMan = ""; - $.each(salesManList, function (i, item) { - salesMan += item.id + ','; - }); - - var params = { - supplierId: sysCustomerUtil.customerMation.id,//客户 - operTime: $("#operTime").val(), - accountId: $("#accountId").val(), - payType: $("#payType").val(), - remark: $("#remark").val(), - discount: isNull($("#discount").val()) ? "0.00" : $("#discount").val(), - discountMoney: isNull($("#discountMoney").val()) ? "0.00" : $("#discountMoney").val(), - changeAmount: isNull($("#changeAmount").val()) ? "0.00" : $("#changeAmount").val(), - depotheadStr: JSON.stringify(tableData), - otherMoney: otherMoney.toFixed(2), - otherMoneyList: JSON.stringify(otherPriceResult.dataList), - salesMan: salesMan, - submitType: submitType, - subType: subType, - approvalId: approvalId - }; - AjaxPostUtil.request({url: flowableBasePath + "salesoutlet002", params: params, type: 'json', method: "POST", callback: function(json) { - dsFormUtil.savePageData("dsFormShow", json.bean.id); - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - - $('#salesMan').tagEditor({ - initialTags: [], - placeholder: '请选择销售人员', - editorTag: false, - beforeTagDelete: function(field, editor, tags, val) { - salesManList = [].concat(arrayUtil.removeArrayPointName(salesManList, val)); - } - }); - - //人员选择 - $("body").on("click", "#toSalesManSelPeople", function(e) { - systemCommonUtil.userReturnList = [].concat(salesManList); - systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含 - systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要 - systemCommonUtil.checkType = "1"; // 人员选择类型，1.多选；其他。单选 - systemCommonUtil.openSysUserStaffChoosePage(function (userReturnList) { - // 重置数据 - salesManList = [].concat(systemCommonUtil.tagEditorResetData('salesMan', userReturnList)); - }); - }); - - //客户选择 - $("body").on("click", "#customMationSel", function (e) { - sysCustomerUtil.openSysCustomerChoosePage(function (customerMation) { - $("#customName").val(customerMation.customName); - }); - }); - - // 加载商品选择事件 - initChooseProductBtnEnent(form, function(trId, chooseProductMation) { - // 商品赋值 - allChooseProduct[trId] = chooseProductMation; - }); - - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); -}); \ No newline at end of file diff --git a/erp/src/main/resources/template/js/salesOutlet/salesOutletDetails.js b/erp/src/main/resources/template/js/salesOutlet/salesOutletDetails.js deleted file mode 100644 index 9b88188b4d70946b94df06972ebe954dbc55806b..0000000000000000000000000000000000000000 --- a/erp/src/main/resources/template/js/salesOutlet/salesOutletDetails.js +++ /dev/null @@ -1,51 +0,0 @@ -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'jqprint'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$; - var beanTemplate = $("#beanTemplate").html(); - - showGrid({ - id: "showForm", - url: flowableBasePath + "erpcommon001", - params: {rowId: parent.rowId}, - pagination: false, - template: beanTemplate, - ajaxSendAfter:function (json) { - $("#statusName").html(activitiUtil.showStateName(json.bean.state, json.bean.submitType)); - - var str = '无'; - var defaultNumber = json.bean.defaultNumber; - if (!isNull(json.bean.linkNumber)){ - str = '' + json.bean.linkNumber + ''; - defaultNumber += '[转]'; - } - - $("#linkNumber").html(str); - $("#defaultNumber").html(defaultNumber); - - // 加载动态表单 - dsFormUtil.loadPageShowDetailsByObjectId("dsFormShow", json.bean.id); - - matchingLanguage(); - form.render(); - } - }); - - // 打印 - $("body").on("click", "#jprint", function (e) { - $("#showForm").jqprint({ - title: sysMainMation.mationTitle, - debug: false, //如果是true则可以显示iframe查看效果（iframe默认高和宽都很小，可以再源码中调大），默认是false - importCSS: true, //true表示引进原来的页面的css，默认是true。（如果是true，先会找$("link[media=print]")，若没有会去找$("link")中的css文件） - printContainer: true, //表示如果原来选择的对象必须被纳入打印（注意：设置为false可能会打破你的CSS规则）。 - operaSupport: true//表示如果插件也必须支持歌opera浏览器，在这种情况下，它提供了建立一个临时的打印选项卡。默认是true - }); - }); - }); -}); \ No newline at end of file diff --git a/erp/src/main/resources/template/js/salesOutlet/salesOutletEdit.js b/erp/src/main/resources/template/js/salesOutlet/salesOutletEdit.js deleted file mode 100644 index 68929952fbda6e8f8d4052a6aa31eb89592f4c29..0000000000000000000000000000000000000000 --- a/erp/src/main/resources/template/js/salesOutlet/salesOutletEdit.js +++ /dev/null @@ -1,335 +0,0 @@ - -// 根据那一列的值进行变化,默认根据数量 -var showTdByEdit = 'rkNum'; - -// 兼容动态表单 -var layedit, form; - -// 销售出库单 -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'jquery', 'winui', 'laydate', 'textool', 'tagEditor'].concat(dsFormUtil.mastHaveImport), function(exports) { - winui.renderColor(); - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - laydate = layui.laydate, - textool = layui.textool; - layedit = layui.layedit, - form = layui.form; - var serviceClassName = sysServiceMation["outIsSalesOutlet"]["key"]; - - var inoutitemHtml = "";//支出项目 - var salesManList = new Array();//销售人员 - - var selOption = getFileContent('tpl/template/select-option.tpl'); - // 已经选择的商品集合key：表格的行trId，value：商品信息 - var allChooseProduct = {}; - - // 获取单据提交类型 - var submitType = ""; - - // 单据时间 - laydate.render({elem: '#operTime', type: 'datetime', trigger: 'click'}); - - // 初始化账户 - systemCommonUtil.getSysAccountListByType(function (json) { - // 加载账户数据 - $("#accountId").html(getDataUseHandlebars(selOption, json)); - }); - - // 初始化支出项目 - systemCommonUtil.getSysInoutitemListByType(2, function (json) { - // 加载支出项目 - inoutitemHtml = getDataUseHandlebars(selOption, json); - }); - - // 初始化仓库 - erpOrderUtil.getDepotList(function (json){ - // 加载仓库数据 - $("#depotId").html(getDataUseHandlebars(selOption, json)); - // 初始化回显数据 - initDataShow(); - }); - - // 初始化回显数据 - function initDataShow(){ - AjaxPostUtil.request({url: flowableBasePath + "salesoutlet003", params: {rowId: parent.rowId}, type: 'json', method: "GET", callback: function(json) { - submitType = json.bean.submitType; - // 客户信息赋值 - sysCustomerUtil.customerMation = { - id: json.bean.organId, - customName: json.bean.customName - } - $("#customName").val(json.bean.customName);//客户 - $("#operTime").val(json.bean.operTime); - $("#accountId").val(json.bean.accountId); - $("#payType").val(json.bean.payType); - $("#allPrice").html(json.bean.totalPrice.toFixed(2)); - $("#taxLastMoneyPrice").html(json.bean.taxLastMoneyPrice.toFixed(2)); - $("#remark").val(json.bean.remark); - $("#discount").val(json.bean.discount.toFixed(2)); - $("#discountMoney").val(json.bean.discountMoney.toFixed(2)); - $("#discountLastMoney").html(json.bean.discountLastMoney.toFixed(2)); - $("#changeAmount").val(json.bean.changeAmount.toFixed(2)); - $("#arrears").html(json.bean.arrears.toFixed(2)); - $("#otherPriceTotal").html("费用合计：" + json.bean.otherMoney.toFixed(2)); - - initTable(); - - // 回显商品列表 - initTableChooseUtil.deleteAllRow('productList'); - $.each(json.bean.norms, function(i, item) { - if (i == 0) { - $("#depotId").val(item.depotId); - } - var params = { - "materialId": item.product.materialName + "(" + item.product.materialModel + ")", - "mUnitId": { - "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), - "value": item.mUnitId - }, - "allStock": item.allStock, - "rkNum": item.operNum, - "unitPrice": item.unitPrice.toFixed(2), - "amountOfMoney": item.allPrice.toFixed(2), - "taxRate": item.taxRate.toFixed(2), - "taxMoney": item.taxMoney.toFixed(2), - "taxUnitPrice": item.taxUnitPrice.toFixed(2), - "taxLastMoney": item.taxLastMoney.toFixed(2), - "remark": item.remark - }; - var trcusid = initTableChooseUtil.resetData('productList', params); - // 将规格所属的商品信息加入到对象中存储 - allChooseProduct[trcusid] = item.product; - }); - - // 回显其他费用 - initTableChooseUtil.deleteAllRow('otherPriceTableList'); - $.each(json.bean.otherMoneyList, function(i, item) { - var params = { - "inoutitemId": { - "value": item.inoutitemId - }, - "otherPrice": parseFloat(item.otherPrice).toFixed(2) - }; - initTableChooseUtil.resetData('otherPriceTableList', params); - }); - - var userNames = ""; - salesManList = json.bean.userInfo; - $.each(salesManList, function (i, item) { - userNames += item.name + ','; - }); - // 人员选择 - $('#salesMan').tagEditor({ - initialTags: userNames.split(','), - placeholder: '请选择销售人员', - editorTag: false, - beforeTagDelete: function(field, editor, tags, val) { - salesManList = [].concat(arrayUtil.removeArrayPointName(salesManList, val)); - } - }); - erpOrderUtil.orderEditPageSetBtnBySubmitType(submitType, json.bean.state); - - textool.init({eleId: 'remark', maxlength: 200}); - - // 加载动态表单 - dsFormUtil.loadPageToEditByObjectId("dsFormShow", json.bean.id); - - matchingLanguage(); - form.render(); - }}); - } - - function initTable() { - // 商品 - initTableChooseUtil.initTable({ - id: "productList", - cols: [ - {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, - {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, - {id: 'allStock', title: '库存', formType: 'detail', width: '80'}, - {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, - {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, - {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, - {id: 'taxRate', title: '税率(%)', formType: 'input', width: '80', className: 'change-input taxRate', verify: 'required|double', value: '0.00'}, - {id: 'taxMoney', title: '税额', formType: 'input', width: '80', className: 'change-input taxMoney', verify: 'required|money'}, - {id: 'taxUnitPrice', title: '含税单价', formType: 'input', width: '80', className: 'change-input taxUnitPrice', verify: 'required|money'}, - {id: 'taxLastMoney', title: '合计价税', formType: 'input', width: '80', className: 'change-input taxLastMoney', verify: 'required|money'}, - {id: 'remark', title: '备注', formType: 'input', width: '100'} - ], - deleteRowCallback: function (trcusid) { - delete allChooseProduct[trcusid]; - // 计算价格 - calculatedTotalPrice(); - }, - addRowCallback: function (trcusid) { - // 设置根据某列变化的颜色 - $("." + showTdByEdit).parent().css({'background-color': '#e6e6e6'}); - calculatedTotalPrice(); - }, - form: form, - minData: 1 - }); - - // 其他费用 - initTableChooseUtil.initTable({ - id: "otherPriceTableList", - cols: [ - {id: 'inoutitemId', title: '支出项目', formType: 'select', width: '120', verify: 'required', modelHtml: inoutitemHtml}, - {id: 'otherPrice', title: '费用合计：0.00', formType: 'input', width: '120', className: 'otherPrice', verify: 'required|money', colHeaderId: 'otherPriceTotal'} - ], - deleteRowCallback: function (trcusid) { - calculationPrice(); - }, - addRowCallback: function (trcusid) { - calculationPrice(); - }, - form: form - }); - } - - // 商品规格加载变化事件 - mUnitChangeEvent(form, allChooseProduct, "salePrice"); - - // 仓库变化事件 - form.on('select(depotId)', function(data) { - loadMaterialDepotStockByDepotId(data.value); - }); - - // 保存为草稿 - form.on('submit(formEditBean)', function(data) { - if(winui.verifyForm(data.elem)) { - saveData('1', ""); - } - return false; - }); - - // 走工作流的提交审批 - form.on('submit(formSubOneBean)', function(data) { - if(winui.verifyForm(data.elem)) { - activitiUtil.startProcess(serviceClassName, null, function (approvalId) { - saveData("2", approvalId); - }); - } - return false; - }); - - // 不走工作流的提交 - form.on('submit(formSubTwoBean)', function(data) { - if(winui.verifyForm(data.elem)) { - saveData('2', ""); - } - return false; - }); - - // 工作流中保存 - form.on('submit(save)', function(data) { - if(winui.verifyForm(data.elem)) { - saveData('3', ""); - } - return false; - }); - - function saveData(subType, approvalId) { - var result = initTableChooseUtil.getDataList('productList'); - if (!result.checkResult) { - return false; - } - var noError = false; - var tableData = []; - $.each(result.dataList, function(i, item) { - //获取行编号 - var thisRowKey = item["trcusid"].replace("tr", ""); - if (parseInt(item.rkNum) == 0) { - $("#rkNum" + thisRowKey).addClass("layui-form-danger"); - $("#rkNum" + thisRowKey).focus(); - winui.window.msg('数量不能为0', {icon: 2, time: 2000}); - noError = true; - return false; - } - //商品对象 - var material = allChooseProduct["tr" + thisRowKey]; - if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) { - winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000}); - noError = true; - return false; - } - item["materialId"] = material.materialId; - item["depotId"] = $("#depotId").val(); - tableData.push(item); - }); - if (noError) { - return false; - } - - // 其他费用 - var otherPriceResult = initTableChooseUtil.getDataList('otherPriceTableList'); - var otherMoney = 0; - $.each(otherPriceResult.dataList, function(i, item) { - otherMoney += parseFloat(isNull(item.otherPrice) ? 0 : item.otherPrice); - }); - - //销售人员 - var salesMan = ""; - $.each(salesManList, function (i, item) { - salesMan += item.id + ','; - }); - - var params = { - supplierId: sysCustomerUtil.customerMation.id,//客户 - operTime: $("#operTime").val(), - accountId: $("#accountId").val(), - payType: $("#payType").val(), - remark: $("#remark").val(), - discount: isNull($("#discount").val()) ? "0.00" : $("#discount").val(), - discountMoney: isNull($("#discountMoney").val()) ? "0.00" : $("#discountMoney").val(), - changeAmount: isNull($("#changeAmount").val()) ? "0.00" : $("#changeAmount").val(), - depotheadStr: JSON.stringify(tableData), - otherMoney: otherMoney.toFixed(2), - otherMoneyList: JSON.stringify(otherPriceResult.dataList), - salesMan: salesMan, - subType: subType, - submitType: submitType, - approvalId: approvalId, - rowId: parent.rowId - }; - AjaxPostUtil.request({url: flowableBasePath + "salesoutlet004", params: params, type: 'json', method: "PUT", callback: function(json) { - dsFormUtil.savePageData("dsFormShow", json.bean.id); - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - - //人员选择 - $("body").on("click", "#toSalesManSelPeople", function (e) { - systemCommonUtil.userReturnList = [].concat(salesManList); - systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含 - systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要 - systemCommonUtil.checkType = "1"; // 人员选择类型，1.多选；其他。单选 - systemCommonUtil.openSysUserStaffChoosePage(function (userReturnList) { - // 重置数据 - salesManList = [].concat(systemCommonUtil.tagEditorResetData('salesMan', userReturnList)); - }); - }); - - // 客户选择 - $("body").on("click", "#customMationSel", function (e) { - sysCustomerUtil.openSysCustomerChoosePage(function (customerMation) { - $("#customName").val(customerMation.customName); - }); - }); - - // 加载商品选择事件 - initChooseProductBtnEnent(form, function(trId, chooseProductMation) { - // 商品赋值 - allChooseProduct[trId] = chooseProductMation; - }); - - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); -}); \ No newline at end of file diff --git a/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js b/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js index a0acccdf86c71f01a85a7bd713755736a09e17ec..ca6843336a534bedd906cdcb7a155b18592f4563 100644 --- a/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js +++ b/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js @@ -1,28 +1,22 @@ -var rowId = ""; - layui.config({ base: basePath, version: skyeyeVersion }).extend({ window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) { +}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { winui.renderColor(); var $ = layui.$, form = layui.form, - laydate = layui.laydate, table = layui.table; var serviceClassName = sysServiceMation["outIsSalesOutlet"]["key"]; authBtn('1571813632546');//添加 - authBtn('1572231503534');//导出 - - laydate.render({elem: '#operTime', range: '~'}); - + table.render({ id: 'messageTable', elem: '#messageTable', method: 'post', - url: flowableBasePath + 'salesoutlet001', + url: sysMainMation.erpBasePath + 'salesoutlet001', where: getTableParams(), even: true, page: true, @@ -30,35 +24,35 @@ layui.config({ limit: getLimit(), cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' }, - { field: 'defaultNumber', title: '单据编号', align: 'left', rowspan: '2', width: 250, templet: function (d) { - var str = '' + d.defaultNumber + ''; + { field: 'oddNumber', title: '单据编号', align: 'left', rowspan: '2', width: 250, templet: function (d) { + var str = '' + d.oddNumber + ''; if (!isNull(d.linkNumber)){ str += '[转]'; } return str; }}, - { field: 'supplierName', title: '客户', align: 'left', rowspan: '2', width: 150 }, - { title: '审批模式', align: 'center', colspan: '2'}, - { field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function (d) { - return activitiUtil.showStateName(d.state, d.submitType); - }}, - { field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120}, - { field: 'taxMoney', title: '含税合计', align: 'left', rowspan: '2', width: 120 }, - { field: 'discountLastMoney', title: '优惠后金额', align: 'left', rowspan: '2', width: 120 }, - { field: 'changeAmount', title: '收款', align: 'left', rowspan: '2', width: 120 }, - { field: 'operPersonName', title: '操作人', align: 'left', rowspan: '2', width: 100}, - { field: 'operTime', title: '单据日期', align: 'center', rowspan: '2', width: 140 }, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', rowspan: '2', align: 'center', width: 200, toolbar: '#tableBar'} - ],[ - { field: 'submitType', title: '提交模式', align: 'left', width: 120, templet: function (d) { - return erpOrderUtil.getSubmitTypeName(d); + { field: 'holderMation', title: '客户', align: 'left', width: 150, templet: function (d) { + return d.holderMation.name; + }}, + { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 }, + { field: 'operTime', title: '单据日期', align: 'center', width: 140 }, + { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { + return '' + d.processInstanceId + ''; + }}, + { field: 'state', title: '状态', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); }}, - { field: 'processInstanceId', title: '流程实例id', align: 'left', width: 120, templet: function (d) { - return erpOrderUtil.getProcessInstanceIdBySubmitType(d); - }} + { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 }, + { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 }, + { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 }, + { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 }, + { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', rowspan: '2', 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()}); + }); } }); @@ -66,16 +60,18 @@ layui.config({ var data = obj.data; var layEvent = obj.event; if (layEvent === 'delete') { //删除 - deletemember(data); + erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() { + loadTable(); + }); } else if (layEvent === 'details') { //详情 details(data); } else if (layEvent === 'edit') { //编辑 edit(data); - } else if (layEvent === 'submitToSave') { //提交 - subExamine(data); - } else if (layEvent === 'subExamine') { //提交审核 - subExamine(data); - } else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看 + } else if (layEvent === 'subApproval') { //提交审核 + erpOrderUtil.submitOrderMation(data.id, serviceClassName, function() { + loadTable(); + }); + } else if (layEvent === 'processDetails') { // 工作流流程详情查看 activitiUtil.activitiDetails(data); } else if (layEvent === 'revoke') { //撤销 erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() { @@ -84,33 +80,23 @@ layui.config({ } }); - form.render(); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - refreshTable(); - } - return false; + // 添加 + $("body").on("click", "#addBean", function() { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2023042700001', null), + title: systemLanguage["com.skyeye.addPageTitle"][languageType], + pageId: "salesOutletAdd", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); }); - // 删除 - function deletemember(data) { - erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() { - loadTable(); - }); - } - - // 提交数据 - function subExamine(data) { - erpOrderUtil.submitOrderMation(data.id, serviceClassName, data.submitType, serviceClassName, function() { - loadTable(); - }); - } - // 编辑 function edit(data) { - rowId = data.id; _openNewWindows({ - url: "../../tpl/salesOutlet/salesOutletEdit.html", + url: systemCommonUtil.getUrl('FP2023042700002&id=' + data.id, null), title: systemLanguage["com.skyeye.editPageTitle"][languageType], pageId: "salesOutletEdit", area: ['90vw', '90vh'], @@ -122,9 +108,8 @@ layui.config({ // 详情 function details(data) { - rowId = data.id; _openNewWindows({ - url: "../../tpl/salesOutlet/salesOutletDetails.html", + url: systemCommonUtil.getUrl('FP2023042700003&id=' + data.id, null), title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], pageId: "salesOutletDetails", area: ['90vw', '90vh'], @@ -132,54 +117,16 @@ layui.config({ }}); } - // 添加 - $("body").on("click", "#addBean", function() { - _openNewWindows({ - url: "../../tpl/salesOutlet/salesOutletAdd.html", - title: systemLanguage["com.skyeye.addPageTitle"][languageType], - pageId: "salesOutletAdd", - 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 refreshTable(){ - table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}) - } - - //导出excel - $("body").on("click", "#downloadExcel", function () { - postDownLoadFile({ - url : flowableBasePath + 'salesoutlet005', - params: getTableParams(), - method : 'post' - }); - }); - function getTableParams() { - var startTime = ""; - var endTime = ""; - if (!isNull($("#operTime").val())) { - startTime = $("#operTime").val().split('~')[0].trim() + ' 00:00:00'; - endTime = $("#operTime").val().split('~')[1].trim() + ' 23:59:59'; - } - return { - defaultNumber: $("#defaultNumber").val(), - startTime: startTime, - endTime: endTime - }; + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); } exports('salesOutletList', {}); diff --git a/erp/src/main/resources/template/tpl/purchaseOrder/purchaseOrderList.html b/erp/src/main/resources/template/tpl/purchaseOrder/purchaseOrderList.html index 32cc07f43eec5dc6a0bd0c7049b3a57dccbb83a6..393cb4a2a136b5488f2c8bb1ca0ae75cfbe141eb 100644 --- a/erp/src/main/resources/template/tpl/purchaseOrder/purchaseOrderList.html +++ b/erp/src/main/resources/template/tpl/purchaseOrder/purchaseOrderList.html @@ -8,7 +8,7 @@
-
+
diff --git a/erp/src/main/resources/template/tpl/salesOutlet/salesOutletAdd.html b/erp/src/main/resources/template/tpl/salesOutlet/salesOutletAdd.html deleted file mode 100644 index 35546f0edc872c55aa79060ff407d15a66a1ebd8..0000000000000000000000000000000000000000 --- a/erp/src/main/resources/template/tpl/salesOutlet/salesOutletAdd.html +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - -
-
-
- 基本信息
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- 0.00 -
-
-
- -
- 0.00 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- 0.00 -
-
-
- -
- -
-
-
- -
- 0.00 -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
-
-
- - - - -
-
-
-
- - - - - - - - \ No newline at end of file diff --git a/erp/src/main/resources/template/tpl/salesOutlet/salesOutletDetails.html b/erp/src/main/resources/template/tpl/salesOutlet/salesOutletDetails.html deleted file mode 100644 index 6a45f6616c830b5540ed1f0455189a209796f892..0000000000000000000000000000000000000000 --- a/erp/src/main/resources/template/tpl/salesOutlet/salesOutletDetails.html +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - - - -
-
- -
- -
-
- -
-
- - - -
- - - - - \ No newline at end of file diff --git a/erp/src/main/resources/template/tpl/salesOutlet/salesOutletEdit.html b/erp/src/main/resources/template/tpl/salesOutlet/salesOutletEdit.html deleted file mode 100644 index 74438ca31f41a79d3221cca7dff0cbeea6b51650..0000000000000000000000000000000000000000 --- a/erp/src/main/resources/template/tpl/salesOutlet/salesOutletEdit.html +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - -
-
-
- 基本信息
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- 0.00 -
-
-
- -
- 0.00 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- 0.00 -
-
-
- -
- -
-
-
- -
- 0.00 -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
-
-
- - - - - -
-
-
-
- - - - - - - - \ No newline at end of file diff --git a/erp/src/main/resources/template/tpl/salesOutlet/salesOutletList.html b/erp/src/main/resources/template/tpl/salesOutlet/salesOutletList.html index d3c8c2d03cfae264e6b6aa429c3039368e26c2d6..e8d898d41b4b4525734dfbf4d4445053c5821b23 100644 --- a/erp/src/main/resources/template/tpl/salesOutlet/salesOutletList.html +++ b/erp/src/main/resources/template/tpl/salesOutlet/salesOutletList.html @@ -7,70 +7,32 @@ -
-
-
-
- -
- -
- -
- -
- - -
-
-
-
- - - + +
- -
diff --git a/web/src/main/resources/template/json/skyeyeClassEnum.json b/web/src/main/resources/template/json/skyeyeClassEnum.json index 3311e26d5de04ebcfeafd1380ff61ec566272bbf..53c8752eca6aa5813d92916b7e1160b4544a2e3b 100644 --- a/web/src/main/resources/template/json/skyeyeClassEnum.json +++ b/web/src/main/resources/template/json/skyeyeClassEnum.json @@ -28,6 +28,7 @@ "materialNormsStockType": {"name": "商品规格库存类型枚举类", "className": "skyeye-erp#com.skyeye.material.classenum.MaterialNormsStockType"}, "materialInOrderType": {"name": "商品在单据中的类型", "className": "skyeye-erp#com.skyeye.material.classenum.MaterialInOrderType"}, "depotPutOutType": {"name": "出入库类型枚举类", "className": "skyeye-erp#com.skyeye.depot.classenum.DepotPutOutType"}, + "erpOrderStateEnum": {"name": "ERP单据状态枚举类", "className": "skyeye-erp#com.skyeye.classenum.ErpOrderStateEnum"}, "skyeyeView": {"name": "视图枚举", "className": "skyeye-pro#com.skyeye.common.SkyeyeViewEnum"}, "widthScale": {"name": "宽度比例枚举", "className": "skyeye-pro#com.skyeye.attr.classenum.WidthScale"},