34123 工作情况考核审核---已处理页面，审核状态搜索不生效

FormInsertDiy/AffairPage/AuditPage/AuditPage.js

@@ -14,7 +14,6 @@ class AuditPage extends Component {
 		this.state = {};
 	}
 
-
 	// componentDidMount() {
 	//   console.log(this.context);
 	// }
@@ -83,13 +82,23 @@ class AuditPage extends Component {
 					console.log(data);
 					let searcherKeyValue = {};
 					for (let item of searchCondition) {
-						if (typeof data[item.key] !== 'undefined' && item.key !== 'taskDefKey') {
+						if (
+							typeof data[item.key] !== 'undefined' &&
+							item.key !== 'taskDefKey' &&
+							item.key !== 'process_status'
+						) {
 							searcherKeyValue[item.base52] = data[item.key];
 						}
 					}
 					if (searcherKeyValue && Object.keys(searcherKeyValue).length) {
 						data.searcherKeyValue = JSON.stringify(searcherKeyValue);
 					}
+
+					if (data.process_status) {
+						data.formStatusId = data.process_status;
+						delete data.process_status;
+					}
+
 					return data;
 				},
 				responseCallBack: (response) => {
@@ -127,13 +136,20 @@ class AuditPage extends Component {
 					let searcherKeyValue = {};
 					console.log(data);
 					for (let item of searchCondition) {
-						if (typeof data[item.key] !== 'undefined' && item.key !== 'taskDefKey') {
+						if (typeof data[item.key] !== 'undefined'
+              && item.key !== 'taskDefKey'
+              && item.key !== 'process_status'
+            ) {
 							searcherKeyValue[item.base52] = data[item.key];
 						}
 					}
 					if (searcherKeyValue && Object.keys(searcherKeyValue).length) {
 						data.searcherKeyValue = JSON.stringify(searcherKeyValue);
 					}
+          if (data.process_status) {
+            data.formStatusId = data.process_status;
+            delete data.process_status;
+          }
 					return data;
 				},
 				condition: searchCondition.filter((g) => {
@@ -155,7 +171,6 @@ class AuditPage extends Component {
 			},
 			tableRowKey: 'id',
 			columns,
-
 		};
 		return {
 			tab1,
@@ -184,5 +199,4 @@ class AuditPage extends Component {
 
 AuditPage.contextType = CreateC;
 
-
 export default AuditPage;

FormInsertDiy/config/index.js

@@ -34,6 +34,41 @@ const text = [
 	'VARCHAR',
 ];
 
+const optionsStatus = [
+	{
+		label: '未提交',
+		value: 'un_audit',
+	},
+	{
+		label: '审核中',
+		value: 'in_audit',
+	},
+	{
+		label: '已审核',
+		value: 'audited',
+	},
+	// { label: '已拒绝', value: 'refuse' },
+	{
+		label: '已失效',
+		value: 'invalid',
+	},
+	// { label: '已挂起', value: 'hang_up' },
+	{
+		label: '已终止',
+		value: 'termination',
+	},
+	// { label: '已驳回', value: 'reject' },
+	// { label: '已同意', value: 'agree' },
+	{
+		label: '重新提交',
+		value: 're_apply',
+	},
+	{
+		label: '己拒绝',
+		value: 'bad_audited',
+	},
+];
+
 const number = ['BIGINT', 'DOUBLE', 'FLOAT', 'INT', 'INTEGER', 'NUMERIC', 'SMALLINT', 'TINYINT'];
 
 const date = ['DATE', 'DATETIME', 'TIME', 'TIMESTAMP', 'YEAR'];
@@ -171,64 +206,77 @@ const getSearchCondition = async (id, appId = undefined) => {
 			return res.filter((x) => {
 				return x.isShowQuery !== false && x.isHidden === false;
 			});
-		}else{
+		} else {
 			return [];
 		}
 	});
 	// console.log(JSON.stringify(searchHeaders));
-  for (let item of searchHeaders) { // H:\project\one_stop_front\src\pages\AdminSystem\pages\ddl\formList\index.js
-    if(item.referenceObjId && item.id && item.referenceCodeName && item.referenceNameName){ //通过引用去查枚举
+	for (let item of searchHeaders) {
+		// H:\project\one_stop_front\src\pages\AdminSystem\pages\ddl\formList\index.js
+		if (item.referenceObjId && item.id && item.referenceCodeName && item.referenceNameName) {
+			//通过引用去查枚举
 			item.options = await service.getBatchOptions(item.id).then((res) => {
-        if(res && res[item.id]){
-          return res[item.id].filter((g) => {
+				if (res && res[item.id]) {
+					return res[item.id]
+						.filter((g) => {
 							return !!g.name && !!g.row_id;
-          }).map((y) => {
+						})
+						.map((y) => {
 							return {
 								key: y[item.referenceCodeName],
 								name: y[item.referenceNameName],
 							};
 						});
-        }else {
+				} else {
 					return [];
 				}
 			});
 		}
 
-
-
 		if (item.isGroupQuery && item.id && (!item.options || !item.options.length)) {
 			// 获取下拉搜索条件的枚举项
 
-      if(item.name === 'process_status'){
+			if (item.name === 'process_status') {
 				/**
 				 * 29890 活动发布管理/活动申报审核/通知活动审核，“活动名称”没有显示；筛选输入有误（103123，bdk@2022*$）
 				 * 2022年9月26日
-         * 钟是志
 				 * 可能需要修改 流程审核状态的枚举
+				 *
+				 * 2023-04-17 和雅职2.0的枚举 保持一致!!
+				 * 解决禅道 34123
 				 * */
-        item.options = [
-          {
-            key: '0',
-            name: '已通过',
-          },
-          {
-            key: '1',
-            name: '已拒绝',
-          },
-          {
-            key: '2',
-            name: '已驳回',
-          },
-          {
-            key: '-1',
-            name: '审核中',
-          },
-        ];
-      }else{
-        item.options = await service.getGroupList({
+				// item.name = 'formStatusId';
+				item.options = optionsStatus.map((x) => {
+					return {
+						key: x.value,
+						name: x.label,
+					};
+				});
+				// item.options = [
+				//   {
+				//     key: '0',
+				//     name: '已通过',
+				//   },
+				//   {
+				//     key: '1',
+				//     name: '已拒绝',
+				//   },
+				//   {
+				//     key: '2',
+				//     name: '已驳回',
+				//   },
+				//   {
+				//     key: '-1',
+				//     name: '审核中',
+				//   },
+				// ];
+			} else {
+				item.options = await service
+					.getGroupList({
 						columnId: item.id,
 						appId,
-        }).then((res) => {
+					})
+					.then((res) => {
 						if (res && Array.isArray(res)) {
 							return res
 								.filter((x) => {