From a7cfc05622923ea0680d2c33e4578f255c6575ad Mon Sep 17 00:00:00 2001 From: "LAPTOP-UV1MNL38\\18023" <1802330370@qq.com> Date: Mon, 22 Jul 2024 17:12:19 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9pc=E7=AB=AF?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=87=BA=E5=BA=93=E5=92=8C=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/template/js/depotOut/list.js | 27 ++++++++++------- .../resources/template/js/depotPut/list.js | 29 +++++++++++-------- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/erp/src/main/resources/template/js/depotOut/list.js b/erp/src/main/resources/template/js/depotOut/list.js index 27919c52c..021ecbbcc 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/depotPut/list.js b/erp/src/main/resources/template/js/depotPut/list.js index f5864c510..06ec9401b 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(); -- GitLab