diff --git a/erp/src/main/resources/template/js/salesOrder/salesOrderToReturns.js b/erp/src/main/resources/template/js/salesOrder/salesOrderToReturns.js index 63aa94559e78919d5e8a1ce8ab679565085900e4..7e9f8808fbca1a7e1b5cc0bbb7ac08dd038984ae 100644 --- a/erp/src/main/resources/template/js/salesOrder/salesOrderToReturns.js +++ b/erp/src/main/resources/template/js/salesOrder/salesOrderToReturns.js @@ -30,24 +30,6 @@ layui.config({ parent.refreshCode = '0'; }}); }, - - // // 组件加载完成后的回调函数 - // loadComponentCallback: function () { - // $("div[controlType='customer']").remove(); - // }, - // - // // 新增行的回调函数 - // tableAddRowCallback: function (tableId) { - // $("#addRow" + tableId).remove(); - // $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true); - // $("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(".specifications").prop('disabled', true); - // } }); }}); }); \ No newline at end of file diff --git a/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js b/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js index 8e724865e7b7e038fe2cfa7986a0e2812506c83c..5589746d8d1ca02bfa1f800f1a560dc36a300818 100644 --- a/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js +++ b/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js @@ -23,30 +23,38 @@ layui.config({ limits: getLimits(), limit: getLimit(), cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'oddNumber', title: '单据编号', align: 'left', width: 250, templet: function (d) { + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2'}, + { field: 'oddNumber', title: '单据编号', rowspan: '2', align: 'left', width: 250, templet: function (d) { var str = '' + d.oddNumber + ''; if (!isNull(d.fromId)) { str += '[转]'; } return str; }}, - { field: 'holderMation', title: '客户', align: 'left', width: 150, templet: function (d) { + { field: 'holderMation', title: '客户', rowspan: '2', align: 'left', width: 150, templet: function (d) { return getNotUndefinedVal(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) { + { field: 'totalPrice', title: '合计金额', rowspan: '2',align: 'left', width: 120 }, + { field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 }, + { colspan: '2', title: '来源单据信息', align: 'center' }, + { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) { return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, - { field: 'state', title: '状态', width: 90, templet: function (d) { + { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { 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 }, - { 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', align: 'center', width: 200, toolbar: '#tableBar'} + { 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'} + ],[ + { field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sealReturnFromType", '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/tpl/salesOrder/salesOrderList.html b/erp/src/main/resources/template/tpl/salesOrder/salesOrderList.html index d52e3203fbbd2b297b758d8e64e8a116101436b4..746914f3524a961fffcc0b560836d8de0cdaf983 100644 --- a/erp/src/main/resources/template/tpl/salesOrder/salesOrderList.html +++ b/erp/src/main/resources/template/tpl/salesOrder/salesOrderList.html @@ -44,12 +44,12 @@ {{# } }} {{# if(d.state == 'pass') { }} {{# if(auth('1720343655250')){ }} - 转销售退货 + 转销售退货 {{# } }} {{# } }} {{# if(d.state == 'partiallyCompleted') { }} {{# if(auth('1720343655250')){ }} - 转销售退货 + 转销售退货 {{# } }} {{# } }}