From bfd5b92c675a139dfc9ec20c6bbf14941216343f Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Sat, 8 Jun 2024 17:12:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BE=9B=E5=BA=94=E5=95=86=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E5=90=88=E5=90=8C=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../startProcessPersonChooseBtn.html | 4 +-- .../arrangeInterviewerIsMyList.js | 2 +- .../supplierContract/supplierContractList.js | 34 ++++++++++++------- .../assets/lib/layui/customer/activitiUtil.js | 4 +-- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/activiti/src/main/resources/template/tpl/approvalActiviti/startProcessPersonChooseBtn.html b/activiti/src/main/resources/template/tpl/approvalActiviti/startProcessPersonChooseBtn.html index 341f3c4e4..75d490f9d 100644 --- a/activiti/src/main/resources/template/tpl/approvalActiviti/startProcessPersonChooseBtn.html +++ b/activiti/src/main/resources/template/tpl/approvalActiviti/startProcessPersonChooseBtn.html @@ -11,9 +11,9 @@
-
+
- +
diff --git a/boss/src/main/resources/template/js/bossInterviewer/arrangeInterviewerIsMyList.js b/boss/src/main/resources/template/js/bossInterviewer/arrangeInterviewerIsMyList.js index 8fbdbf038..6d48fd556 100644 --- a/boss/src/main/resources/template/js/bossInterviewer/arrangeInterviewerIsMyList.js +++ b/boss/src/main/resources/template/js/bossInterviewer/arrangeInterviewerIsMyList.js @@ -47,7 +47,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/src/main/resources/template/js/supplierContract/supplierContractList.js b/erp/src/main/resources/template/js/supplierContract/supplierContractList.js index 721cb5987..058313356 100644 --- a/erp/src/main/resources/template/js/supplierContract/supplierContractList.js +++ b/erp/src/main/resources/template/js/supplierContract/supplierContractList.js @@ -32,24 +32,25 @@ layui.config({ limits: getLimits(), limit: getLimit(), cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'title', title: '合同名称', align: 'left', width: 300, templet: function (d) { + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2' }, + { field: 'title', title: '合同名称', rowspan: '2', align: 'left', width: 300, templet: function (d) { return '' + d.title + ''; }}, - { field: 'oddNumber', title: '合同编号', align: 'left', width: 120 }, - { field: 'price', title: '合同金额（元）', align: 'left', width: 120 }, - { field: 'signingTime', title: '签约日期', align: 'center', width: 100 }, - { field: 'processInstanceId', title: '流程ID', align: 'center', width: 100, templet: function (d) { + { field: 'oddNumber', title: '合同编号', rowspan: '2', align: 'left', width: 120 }, + { field: 'price', title: '合同金额（元）', rowspan: '2', align: 'left', width: 120 }, + { field: 'signingTime', title: '签约日期', rowspan: '2', align: 'center', width: 100 }, + { colspan: '2', title: '来源单据信息', align: 'center' }, + { field: 'processInstanceId', title: '流程ID', rowspan: '2', align: 'center', 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("supplierContractStateEnum", 'id', d.state, 'name'); }}, - { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', 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: 250, templet: function (d) { + { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', align: 'left', 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], fixed: 'right', align: 'center', rowspan: '2', width: 250, templet: function (d) { var str = ''; if (d.editRow == 1) { if (authPermission['submitToApproval']) { @@ -93,7 +94,14 @@ layui.config({ return str; }} - ]], + ], [ + { field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("supplierContractFromType", 'id', d.fromTypeId, 'name'); + }}, + { field: 'fromId', title: '单据编号', width: 200, templet: function (d) { + return getNotUndefinedVal(d.fromMation?.oddNumber); + }} + ]], done: function(json) { matchingLanguage(); initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入合同名称", function () { diff --git a/web/src/main/resources/template/assets/lib/layui/customer/activitiUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/activitiUtil.js index 4b7c4fbe9..28702c1f4 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/activitiUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/activitiUtil.js @@ -112,9 +112,9 @@ var activitiUtil = { if (!isNull(json.bean) && !$.isEmptyObject(json.bean)) { var approvalPersonChooseDom = '
' + '' + - '
' + + '
' + '' + - '' + + '' + '
' + '
'; $("#" + appendDomId).append(approvalPersonChooseDom); -- GitLab