@@ -612,10 +612,10 @@ export default {
* 标准法规管理流程
* @returns {boolean}
*/
- bzfggllc() {
- const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1']
- return this.checkPermission(idArray)
- },
+ // bzfggllc() {
+ // const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1']
+ // return this.checkPermission(idArray)
+ // },
/**
* 政策管理流程
* @returns {boolean}
From 34ab46fd7fcf319e0a3405285652b05a62722f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 22 Mar 2022 09:27:16 +0800
Subject: [PATCH 28/31] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?=
=?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=2051986?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/localTool/standAutoSplit/index.vue | 31 ++++++++++++--------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index d7dc6b2fd..d4850fe67 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -993,19 +993,24 @@ export default {
}, {
_this: this, loading: 'loading'
}, res => {
- res.data.list.map((item, index) => {
- if (item.collectId != null && item.collectId !== '') {
- item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
- item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
- item.collectBtn = false
- } else {
- item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
- item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
- item.collectBtn = true
- }
- })
- this.standInfoList = res.data.list
- this.total = res.data.count
+ if(res.data.list.length){
+ res.data.list.map((item, index) => {
+ if (item.collectId != null && item.collectId !== '') {
+ item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
+ item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
+ item.collectBtn = false
+ } else {
+ item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
+ item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
+ item.collectBtn = true
+ }
+ })
+ this.standInfoList = res.data.list
+ this.total = res.data.count
+ }else{
+ this.splitInfoPage = 1
+ this.getSarFileSplitInfoEOPage()
+ }
}, e => {
})
},
From 3f5309a185ae8946f583b8c6e413ec0043d7551c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 22 Mar 2022 09:39:30 +0800
Subject: [PATCH 29/31] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E5=BA=93=E5=B9=B4=E4=BB=BD=E6=A0=A1=E9=AA=8C=2051992?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../domesticStandardsAndRegulations/index.vue | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index c91d4302c..8b6392826 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -2747,11 +2747,11 @@ export default {
synopsis: [
{type: 'string', max: 500, message: '文本说明不能超过500个字符', trigger: 'change'}
],
- standYear: [
- {required: true, message: '标准年份不能为空', trigger: 'change'},
- // {validator: this.verify.testNumberCode, trigger: 'change'},
- {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
- ],
+ // standYear: [
+ // {required: true, message: '标准年份不能为空', trigger: 'change'},
+ // // {validator: this.verify.testNumberCode, trigger: 'change'},
+ // {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
+ // ],
standName: [
{required: true, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
From 35997c8297bb89be90b174fad0fa892b21f2019a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 22 Mar 2022 10:32:09 +0800
Subject: [PATCH 30/31] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?=
=?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=20yzh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index c709465ca..dbd0abf53 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -831,7 +831,7 @@ export default {
if (valid) {
this.isSubmit = true
this.$http.post('lawss/activiti/startProcessRollBack', {
- id: this.bpnId || '',
+ id: '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '3',
From dd730500bba2910466d1cae132ce3b3353e8d933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 22 Mar 2022 10:43:41 +0800
Subject: [PATCH 31/31] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E9=80=89=E6=8B=A9=E8=B5=B7=E8=8D=89=E9=83=A8=E9=97=A8=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=88=B7=E6=96=B0bug=2051794?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/mechanismTree/index.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/mechanismTree/index.vue b/src/components/mechanismTree/index.vue
index 30cbb6b07..fe409a18e 100644
--- a/src/components/mechanismTree/index.vue
+++ b/src/components/mechanismTree/index.vue
@@ -8,6 +8,7 @@
@close="handleTreeDrawerCancel"
size="400px">