From c4c5880d64a6c6fcbd8947c320bf8547eec9ef97 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 05 Sep 2024 21:11:53 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/utils/selectOption.js | 156 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 138 insertions(+), 18 deletions(-)
diff --git a/gz-customerSystem/src/utils/selectOption.js b/gz-customerSystem/src/utils/selectOption.js
index e30ca84..977bb33 100644
--- a/gz-customerSystem/src/utils/selectOption.js
+++ b/gz-customerSystem/src/utils/selectOption.js
@@ -64,8 +64,27 @@
label: '非法人组织',
},
];
+//上传材料大类
+const fileOwnerCat = [
+ {
+ value: '22_00014-1',
+ label: '申请材料',
+ },
+ {
+ value: '22_00014-2',
+ label: '证据材料',
+ },
+ {
+ value: '22_00014-7',
+ label: '办理材料',
+ },
+ {
+ value: '22_00014-5',
+ label: '结案材料',
+ },
+];
//上传材料类型
-const sourceType = [
+const fileOwnerType = [
{
value: '22_00018-101',
label: '申请材料',
@@ -79,6 +98,18 @@
label: '身份证明材料',
},
{
+ value: '22_00018-207',
+ label: '代理人授权委托书',
+ },
+ {
+ value: '22_00018-203',
+ label: '企业(机构)登记材料',
+ },
+ {
+ value: '22_00018-204',
+ label: '法定(机构)代表人身份证明材料',
+ },
+ {
value: '22_00018-501',
label: '办理附件',
},
@@ -89,6 +120,40 @@
{
value: '22_00018-507',
label: '督办回复附件',
+ },
+ {
+ value: '22_00018-508',
+ label: '联合处置申请附件',
+ },
+ {
+ value: '22_00018-509',
+ label: '联合处置申请审核附件',
+ },
+ {
+ value: '22_00018-520',
+ label: '回退申请附件',
+ },
+ {
+ value: '22_00018-511',
+ label: '回退审核附件',
+ },
+ {
+ value: '22_00018-512',
+ label: '上报申请附件',
+ },
+ {
+ value: '22_00018-513',
+ label: '上报审核附件',
+ },
+];
+// 附件上传人类型
+const uploaderType = [
+ {
+ value: 1,
+ label: '工作人员',
+ },
+ { value: 2,
+ label: '当事人',
},
];
// 性别
@@ -516,6 +581,46 @@
label: '不同意'
},
];
+// 委托关系
+const agentRelate = [
+ {
+ value: '24_00007-1',
+ label: '亲属',
+ },
+ {
+ value: '24_00007-2',
+ label: '监护人',
+ },
+];
+// 企业类型
+const enterpriseType = [
+ {
+ value: '24_00008-1',
+ label: '餐饮服务',
+ },
+];
+// 机构类型
+const orgaType = [
+ {
+ value: '24_00009-1',
+ label: '志愿者服务',
+ },
+];
+//事项等级
+const caseLevelList = [
+ {
+ value: 1,
+ label: '一级'
+ },
+ {
+ value: 2,
+ label: '二级'
+ },
+ {
+ value: 3,
+ label: '三级'
+ },
+]
// VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV 暂时用不到，防止以后会用的，先保留 VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
@@ -647,7 +752,7 @@
},
];
// 任务节点执行者类型
-const operType = [
+const taskCandeType = [
{
value: 1,
label: '所有人',
@@ -1057,47 +1162,62 @@
},
];
+
+
const obj = {
caseCanal,
- mediateType,
+ visitWay,
personType,
personClass,
- sourceType,
+ fileOwnerCat,
+ fileOwnerType,
+ uploaderType,
sex,
- agentClass,
cardType,
- mediateError,
- refuseSign,
- job,
nation,
agentType,
caseStatus,
- signResult,
- dispSource,
- dispType,
- dispHandle,
process,
mediResult,
meetType,
meetWay,
- joinUserType,
+ dispType,
+ auditResult,
+ agentRelate,
+ enterpriseType,
+ orgaType,
+ caseLevelList,
+
+ // VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV 暂时用不到，防止以后会用的，先保留 VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+
+ mediateType,
+ agentClass,
+ job,
noticeWay,
fileStatus,
- operType,
+ taskCandeType,
realStatus,
+ recordStatus,
+ crowd,
+ caseSource,
+
+ // VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV旧系统下拉框，临时保留VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+
+ mediateError,
+ refuseSign,
+ signResult,
+ dispSource,
+ dispHandle,
+ joinUserType,
faceStatus,
judicProcess,
judicStatus,
judicResult,
judicError,
judicReturn,
- recordStatus,
- crowd,
- caseSource,
selectdata,
fulfilSitu,
mediFalseCause,
- auditResult,
};
export default obj;
--
Gitblit v1.8.0