From b79b6f53edc6e8e5135c9c99c90642d62a9b875b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-NDCM9L6Q=5C=E7=8E=8B=E4=B8=BD=E9=9B=85?= <1970384016@qq.com> Date: Wed, 17 Jul 2024 12:11:35 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=95=B4?= =?UTF-8?q?=E5=8D=95=E5=A7=94=E5=A4=96=E5=8D=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preProductionTurnToProduction.js | 5 +-- .../js/erpProduction/erpProductionList.js | 2 +- .../template/js/wholeOut/wholeOutList.js | 42 +++++++++++++------ .../tpl/erpProduction/erpProductionList.html | 13 ++++++ .../template/js/salesOrder/chooseList.js | 1 + .../js/salesOrder/salesOrderToOutlet.js | 1 - 6 files changed, 47 insertions(+), 17 deletions(-) diff --git a/erp-produce/src/main/resources/template/js/erpPreProductionPlan/preProductionTurnToProduction.js b/erp-produce/src/main/resources/template/js/erpPreProductionPlan/preProductionTurnToProduction.js index 02de1f5e6..daa189395 100644 --- a/erp-produce/src/main/resources/template/js/erpPreProductionPlan/preProductionTurnToProduction.js +++ b/erp-produce/src/main/resources/template/js/erpPreProductionPlan/preProductionTurnToProduction.js @@ -38,9 +38,8 @@ layui.config({ // 新增行的回调函数 tableAddRowCallback: function (tableId) { $("#addRow" + tableId).remove(); - $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true); - $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true); - + // $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true); + // $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true); } }); }}); diff --git a/erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js b/erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js index 426343d4b..13610dee0 100644 --- a/erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js +++ b/erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js @@ -57,7 +57,7 @@ layui.config({ ]], done: function(json) { matchingLanguage(); - initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入生产单号", function () { + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () { table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); }); } diff --git a/erp-produce/src/main/resources/template/js/wholeOut/wholeOutList.js b/erp-produce/src/main/resources/template/js/wholeOut/wholeOutList.js index 6988a4040..31caa34a2 100644 --- a/erp-produce/src/main/resources/template/js/wholeOut/wholeOutList.js +++ b/erp-produce/src/main/resources/template/js/wholeOut/wholeOutList.js @@ -27,20 +27,38 @@ layui.config({ limit: getLimit(), cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'oddNumber', title: '单号', align: 'center', width: 200, templet: function (d) { - return '' + d.oddNumber + ''; + { field: 'oddNumber', title: '单号', rowspan: '2', align: 'left', width: 220, templet: function (d) { + var str = '' + d.oddNumber + ''; + if (!isNull(d.fromId)) { + str += '[转]'; + } + return str; }}, - { field: 'accountId', width: 150, title: '账户', align: 'center'}, + // { field: 'departmentId', width: 150, title: '部门', align: 'center',templet: function (d) { + // if (!isNull(d.departmentMation)) { + // return d.departmentMation.name; + // } + // return ''; + // }}, + // // { field: 'farmId', width: 150, title: '车间', align: 'center'}, + // + // { field: 'farmId', title: '车间', align: 'left', width: 150, templet: function (d) { + // if (!isNull(d.farmMation)) { + // return d.farmMation.name; + // } + // return ''; + // }}, + // { field: 'operTime', width: 150, title: '单据日期', align: 'center'}, - { field: 'farmId', width: 150, title: '车间', align: 'center'}, - { field: 'holderId', width: 150, title: '客户', align: 'center'}, - { field: 'departmentId', width: 120, title: '部门', align: 'center'}, - { field: 'salesman', width: 150, title: '业务员', align: 'center'}, - { field: 'planComplateTime', width: 140, title: '计划完成时间', align: 'center'}, + { field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'center', width: 120 }, + // { field: 'farmId', width: 150, title: '车间', align: 'center'}, + { field: 'holderMation', title: '客户', rowspan: '2', align: 'center', width: 150, templet: function (d) { + return getNotUndefinedVal(d.holderMation?.name); + }}, { field: 'processInstanceId', width: 200, title: '流程ID', align: 'center'}, - // { field: 'state', title: '状态', width: 90, templet: function (d) { - // return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("purchaseOrderState", 'id', d.state, 'name'); - // }}, + { field: 'state', title: '状态', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + }}, { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 }, { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 }, { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 }, @@ -49,7 +67,7 @@ layui.config({ ]], done: function(json) { matchingLanguage(); - initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入生产单号", function () { + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () { table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); }); } diff --git a/erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionList.html b/erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionList.html index 3c9f8b316..9489722d6 100644 --- a/erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionList.html +++ b/erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionList.html @@ -32,6 +32,19 @@ 撤销 {{# } }} {{# } }} + + {{# if (d.state == 'pass' || d.state == 'partiallyCompleted') { }} + {{# if (d.productionType == 1) { }} + {{# if (auth('1720796297124')) { }} + 转加工单 + {{# } }} + {{# } }} + {{# if (d.productionType == 2 ) { }} + {{# if (auth('1720835673573')) { }} + 转整单委外单 + {{# } }} + {{# } }} + {{# } }} diff --git a/erp/src/main/resources/template/js/salesOrder/chooseList.js b/erp/src/main/resources/template/js/salesOrder/chooseList.js index 6e8471691..b4059012f 100644 --- a/erp/src/main/resources/template/js/salesOrder/chooseList.js +++ b/erp/src/main/resources/template/js/salesOrder/chooseList.js @@ -36,6 +36,7 @@ layui.config({ { field: 'holderMation', title: '客户', rowspan: '2', align: 'left', width: 150, templet: function (d) { return getNotUndefinedVal(d.holderMation?.name); }}, + { field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120 }, { field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 }, { colspan: '2', title: '来源单据信息', align: 'center' }, diff --git a/erp/src/main/resources/template/js/salesOrder/salesOrderToOutlet.js b/erp/src/main/resources/template/js/salesOrder/salesOrderToOutlet.js index 83cb64d0a..c8ace998a 100644 --- a/erp/src/main/resources/template/js/salesOrder/salesOrderToOutlet.js +++ b/erp/src/main/resources/template/js/salesOrder/salesOrderToOutlet.js @@ -18,7 +18,6 @@ layui.config({ // 销售订单转销售出库 AjaxPostUtil.request({url: sysMainMation.erpBasePath + "querySealsOrderTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) { let data = json.bean; - console.log(5555,data) // 销售出库的【编辑布局】 dsFormUtil.initEditPageForStatic('content', 'FP2023042700002', data, { savePreParams: function (params) { -- GitLab