feat: 供应商采购合同列表修改

activiti/src/main/resources/template/tpl/approvalActiviti/startProcessPersonChooseBtn.html

@@ -11,9 +11,9 @@
 	    <form class="layui-form" action="" id="showForm" autocomplete="off">
 	        <div class="layui-form-item">
 		        <label class="layui-form-label">审批人<i class="red">*</i></label>
-		        <div class="layui-input-block">
+		        <div class="layui-input-block input-add-icon">
 					<input type="text" id="approvalPersonName" name="approvalPersonName" placeholder="请选择审批人" win-verify="required" class="layui-input" readonly="readonly"/>
-					<i class="fa fa-plus-circle input-icon chooseApprovalPersonBtn" style="top: 12px;"></i>
+					<i class="fa fa-plus-circle input-icon chooseApprovalPersonBtn"></i>
 		        </div>
 		    </div>
 		    <div class="layui-form-item">

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()});
             });
         }

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 '<a lay-event="details" class="notice-title-click">' + d.title + '</a>';
 			}},
-			{ 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 '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
-			{ 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 () {

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 = '<div class="layui-form-item layui-col-xs12">' +
                     '<label class="layui-form-label">下一个审批人<i class="red">*</i></label>' +
-                    '<div class="layui-input-block">' +
+                    '<div class="layui-input-block input-add-icon">' +
                     '<input type="text" id="approvalPersonName" name="approvalPersonName" placeholder="请选择下一个审批人" win-verify="required" class="layui-input" readonly="readonly"/>' +
-                    '<i class="fa fa-plus-circle input-icon chooseApprovalPersonBtn" style="top: 12px;"></i>' +
+                    '<i class="fa fa-plus-circle input-icon chooseApprovalPersonBtn"></i>' +
                     '</div>' +
                     '</div>';
                 $("#" + appendDomId).append(approvalPersonChooseDom);