From e37efe0ce023ac2c9a93ba4e14d8a3aa9d073cd4 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 6 Apr 2022 16:06:19 +0800
Subject: [PATCH 1/7] 28849
---
.../xiushan/apps/AppAdministrativePenalty/components/Add.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue b/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
index a581e87d..70c474f2 100644
--- a/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
+++ b/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
@@ -92,7 +92,7 @@
{{ dict.getLabel('administrativeSanctionType',data.sanctionType) }}
-
+
From 0a767cef4668e596b39acd8d746fe9fc1d95a23a Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 6 Apr 2022 16:19:43 +0800
Subject: [PATCH 2/7] type
---
.../xiushan/apps/AppAdministrativeLicense/components/Add.vue | 2 +-
.../xiushan/apps/AppAdministrativePenalty/components/Add.vue | 2 +-
project/xiushan/apps/AppDishonestExecutee/components/Add.vue | 2 +-
project/xiushan/apps/AppRatepayingInfo/components/Add.vue | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue b/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue
index 6135ff7a..a63b6d4a 100644
--- a/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue
+++ b/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue
@@ -55,7 +55,7 @@
-
+
diff --git a/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue b/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
index 70c474f2..ed191545 100644
--- a/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
+++ b/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
@@ -58,7 +58,7 @@
-
+
diff --git a/project/xiushan/apps/AppDishonestExecutee/components/Add.vue b/project/xiushan/apps/AppDishonestExecutee/components/Add.vue
index 3e0a6234..905550f0 100644
--- a/project/xiushan/apps/AppDishonestExecutee/components/Add.vue
+++ b/project/xiushan/apps/AppDishonestExecutee/components/Add.vue
@@ -45,7 +45,7 @@
-
+
diff --git a/project/xiushan/apps/AppRatepayingInfo/components/Add.vue b/project/xiushan/apps/AppRatepayingInfo/components/Add.vue
index 5c44cb71..16c4eee4 100644
--- a/project/xiushan/apps/AppRatepayingInfo/components/Add.vue
+++ b/project/xiushan/apps/AppRatepayingInfo/components/Add.vue
@@ -46,7 +46,7 @@
-
+
From c227b0ec344ee060d74d05e9e3e493b49130ad2a Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 6 Apr 2022 16:35:05 +0800
Subject: [PATCH 3/7] 28857
---
.../xiushan/apps/AppAdministrativePenalty/components/List.vue | 2 +-
project/xiushan/apps/AppDishonestExecutee/components/List.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/project/xiushan/apps/AppAdministrativePenalty/components/List.vue b/project/xiushan/apps/AppAdministrativePenalty/components/List.vue
index 888d7e58..35ec065f 100644
--- a/project/xiushan/apps/AppAdministrativePenalty/components/List.vue
+++ b/project/xiushan/apps/AppAdministrativePenalty/components/List.vue
@@ -8,7 +8,7 @@
添加
-
diff --git a/project/xiushan/apps/AppDishonestExecutee/components/List.vue b/project/xiushan/apps/AppDishonestExecutee/components/List.vue
index 8d8268aa..482defd1 100644
--- a/project/xiushan/apps/AppDishonestExecutee/components/List.vue
+++ b/project/xiushan/apps/AppDishonestExecutee/components/List.vue
@@ -8,7 +8,7 @@
添加
-
导入
From faf2742b688fe7a1d1be57096a4d45bc9112c018 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 6 Apr 2022 17:50:01 +0800
Subject: [PATCH 4/7] 28839
---
.../xiushan/apps/AppAdministrativeLicense/components/Add.vue | 3 ++-
.../xiushan/apps/AppAdministrativePenalty/components/Add.vue | 3 ++-
project/xiushan/apps/AppDishonestExecutee/components/Add.vue | 3 ++-
project/xiushan/apps/AppRatepayingInfo/components/Add.vue | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue b/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue
index a63b6d4a..af4766a6 100644
--- a/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue
+++ b/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue
@@ -119,7 +119,8 @@ export default {
endDate: [{required: true,message:"请选择许可有效期至",trigger: "blur"}],
licenseOrganization: [{required: true,message:"请输入许可机关",trigger: "blur"}],
enterpriseName: [{required: true,message:"请输入经营主体",trigger: "blur"}],
- unifiedCode: [{required: true,message:"请输入统一信用编号",trigger: "blur"}],
+ unifiedCode: [{required: true,message:"请输入统一信用编号",trigger: "blur"},
+ { min: 18, max: 18, message: '长度为18个字符', trigger: 'blur' }],
licenseContent: [{required: true,message:"请输入许可内容",trigger: "blur"}],
}
}
diff --git a/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue b/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
index ed191545..3fb0aa5d 100644
--- a/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
+++ b/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
@@ -124,7 +124,8 @@ export default {
sanctionContent: [{required: true,message:"请输入处罚内容",trigger: "blur"}],
sanctionBasis: [{required: true,message:"请输入处罚依据",trigger: "blur"}],
enterpriseName: [{required: true,message:"请输入受罚主体",trigger: "blur"}],
- unifiedCode: [{required: true,message:"请输入统一信用代码",trigger: "blur"}],
+ unifiedCode: [{required: true,message:"请输入统一信用代码",trigger: "blur"},
+ { min: 18, max: 18, message: '长度为18个字符', trigger: 'blur' }],
lllegalFact: [{required: true,message:"请输入违法事实",trigger: "blur"}],
}
}
diff --git a/project/xiushan/apps/AppDishonestExecutee/components/Add.vue b/project/xiushan/apps/AppDishonestExecutee/components/Add.vue
index 905550f0..e2a0de2c 100644
--- a/project/xiushan/apps/AppDishonestExecutee/components/Add.vue
+++ b/project/xiushan/apps/AppDishonestExecutee/components/Add.vue
@@ -105,7 +105,8 @@ export default {
executionTime: [{required: true,message:"请输入执行时间",trigger: "blur"}],
executionSituation: [{required: true,message:"请选择履行情况",trigger: "blur"}],
enterpriseName: [{required: true,message:"请输入失信被执行主体",trigger: "blur"}],
- unifiedCode: [{required: true,message:"请输入统一信用代码",trigger: "blur"}],
+ unifiedCode: [{required: true,message:"请输入统一信用代码",trigger: "blur"},
+ { min: 18, max: 18, message: '长度为18个字符', trigger: 'blur' }],
dishonestFact: [{required: true,message:"请输入失信事实",trigger: "blur"}],
}
}
diff --git a/project/xiushan/apps/AppRatepayingInfo/components/Add.vue b/project/xiushan/apps/AppRatepayingInfo/components/Add.vue
index 16c4eee4..6c4aa59a 100644
--- a/project/xiushan/apps/AppRatepayingInfo/components/Add.vue
+++ b/project/xiushan/apps/AppRatepayingInfo/components/Add.vue
@@ -106,7 +106,8 @@ export default {
taxYear: [{required: true,message:"请输入纳税年份",trigger: "blur"}],
taxLevel: [{required: true,message:"请选择纳税等级",trigger: "blur"}],
enterpriseName: [{required: true,message:"请输入纳税主体",trigger: "blur"}],
- unifiedCode: [{required: true,message:"请输入统一信用代码",trigger: "blur"}],
+ unifiedCode: [{required: true,message:"请输入统一信用代码",trigger: "blur"},
+ { min: 18, max: 18, message: '长度为18个字符', trigger: 'blur' }],
evaluationUnit: [{required: true,message:"请输入评价单位",trigger: "blur"}],
}
}
From 42a386c38ad4cf43767807beccfef94dce75d0ea Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 6 Apr 2022 17:53:48 +0800
Subject: [PATCH 5/7] 28868
---
.../xiushan/apps/AppAdministrativeLicense/components/Add.vue | 2 +-
.../xiushan/apps/AppAdministrativePenalty/components/Add.vue | 2 +-
project/xiushan/apps/AppDishonestExecutee/components/Add.vue | 2 +-
project/xiushan/apps/AppRatepayingInfo/components/Add.vue | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue b/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue
index af4766a6..5887265e 100644
--- a/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue
+++ b/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue
@@ -74,7 +74,7 @@
-
+
diff --git a/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue b/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
index 3fb0aa5d..8fc87cb3 100644
--- a/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
+++ b/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
@@ -79,7 +79,7 @@
-
+
diff --git a/project/xiushan/apps/AppDishonestExecutee/components/Add.vue b/project/xiushan/apps/AppDishonestExecutee/components/Add.vue
index e2a0de2c..37ae3274 100644
--- a/project/xiushan/apps/AppDishonestExecutee/components/Add.vue
+++ b/project/xiushan/apps/AppDishonestExecutee/components/Add.vue
@@ -64,7 +64,7 @@
-
+
diff --git a/project/xiushan/apps/AppRatepayingInfo/components/Add.vue b/project/xiushan/apps/AppRatepayingInfo/components/Add.vue
index 6c4aa59a..a1a41daa 100644
--- a/project/xiushan/apps/AppRatepayingInfo/components/Add.vue
+++ b/project/xiushan/apps/AppRatepayingInfo/components/Add.vue
@@ -65,7 +65,7 @@
-
+
From f5ea57d30cdabc3080cf6f09b4f1041d2c470959 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 6 Apr 2022 17:54:35 +0800
Subject: [PATCH 6/7] 28867
---
.../xiushan/apps/AppAdministrativeLicense/components/List.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/project/xiushan/apps/AppAdministrativeLicense/components/List.vue b/project/xiushan/apps/AppAdministrativeLicense/components/List.vue
index c8a6640b..3b8077f7 100644
--- a/project/xiushan/apps/AppAdministrativeLicense/components/List.vue
+++ b/project/xiushan/apps/AppAdministrativeLicense/components/List.vue
@@ -1,7 +1,7 @@
-
+
From b929880b7aea80b8300066c80525a4c006782d2b Mon Sep 17 00:00:00 2001
From: yanran200730
Date: Wed, 6 Apr 2022 19:22:04 +0800
Subject: [PATCH 7/7] bug
---
.../mattersConfig/components/addConfig.vue | 4 ++--
.../mattersConfig/components/processApproval.vue | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue b/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
index 26d300b0..2e73bd7a 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
@@ -158,8 +158,8 @@ export default {
}
},
created() {
- if (this.$route.query?.id) {
- this.getDetail(this.$route.query?.id)
+ if (this.row.id) {
+ this.getDetail(this.row.id)
}
}
}
diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
index e822d337..67912f7a 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
@@ -184,7 +184,12 @@ export default {
},
changeCharge (e, i) {
- this.$set(this.form.processNodeList[i], 'candidateList', e)
+ this.$set(this.form.processNodeList[i], 'candidateList', e.map(v => {
+ return {
+ ...v,
+ candidate: v.id
+ }
+ }))
},
/**
* 添加流程