From 5b2ff015b3cbf35de3b67c9f9ea97bd63b5beed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 15 Apr 2022 16:42:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?52374=20=E6=A0=87=E5=87=86=E5=85=A5?=
=?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=EF=BC=8C=EF=BC=8C=E5=85=88=E4=BF=9D?=
=?UTF-8?q?=E5=AD=98=E5=88=B0=E8=8D=89=E7=A8=BF=EF=BC=8C=E4=BB=8E=E8=8D=89?=
=?UTF-8?q?=E7=A8=BF=E6=8F=90=E4=BA=A4=EF=BC=8C=E8=B5=B0=E5=88=B0=E4=BF=AE?=
=?UTF-8?q?=E8=AE=A2=E8=8A=82=E7=82=B9=EF=BC=8C=E6=89=80=E6=9C=89=E7=9A=84?=
=?UTF-8?q?=E9=99=84=E4=BB=B6=E9=83=BD=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step4.vue | 65 ++++++++++---------
1 file changed, 33 insertions(+), 32 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 8adb96b92..592bfdd2e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -2618,49 +2618,50 @@ export default {
/**
* @description: 动态表单读取
*/
- // getFormFieldList(item) {
- // this.$nextTick(() => {
- // this.form = JSON.parse(JSON.stringify(item))
- // this.defaultCheckedKeys = [this.form.standSystem];
- // this.defaultCheckedKeys1 = [this.form.cycvppsbm];
- // this.defaultCheckedKeys2 = [this.form.kccvppsbm];
- // this.defaultCheckedKeys3 = [this.form.dybxh];
- // this.treeCheckedKeys = this.form.treeListId.split(',')
- // this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
- // this.form.standYear = this.form.standYear ? this.form.standYear : ''
- // this.form.prcNum = this.prcNum
- // this.form.prcName = this.prcName
- // this.form['id'] = item.id
- //
- //
- // // 遍历对象
- // for (const p in this.form) {
- // if (typeof (this.form[p]) != "function") {
- // this.initializeFileList(p, this.form[p]);
- // }
- // }
- //
- // this.$forceUpdate()
- // })
- // },
getFormFieldList(item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
- this.defaultCheckedKeys = [this.form.standSystem]
- this.defaultCheckedKeys1 = [this.form.cycvppsbm]
- this.defaultCheckedKeys2 = [this.form.kccvppsbm]
- this.defaultCheckedKeys3 = [this.form.dybxh]
+ this.defaultCheckedKeys = [this.form.standSystem];
+ this.defaultCheckedKeys1 = [this.form.cycvppsbm];
+ this.defaultCheckedKeys2 = [this.form.kccvppsbm];
+ this.defaultCheckedKeys3 = [this.form.dybxh];
+ this.treeCheckedKeys = this.form.treeListId.split(',')
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? this.form.standYear : ''
- if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
- this.form.country = this.form.country.split(",");
- }
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = item.id
+
+
+ // 遍历对象
+ for (const p in this.form) {
+ if (typeof (this.form[p]) != "function") {
+ this.initializeFileList(p, this.form[p]);
+ }
+ }
+
+ this.$forceUpdate()
})
},
+ // getFormFieldList(item) {
+ // this.$nextTick(() => {
+ // this.form = JSON.parse(JSON.stringify(item))
+ // this.defaultCheckedKeys = [this.form.standSystem]
+ // this.defaultCheckedKeys1 = [this.form.cycvppsbm]
+ // this.defaultCheckedKeys2 = [this.form.kccvppsbm]
+ // this.defaultCheckedKeys3 = [this.form.dybxh]
+ // this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+ // this.form.standYear = this.form.standYear ? this.form.standYear : ''
+ // if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
+ // this.form.country = this.form.country.split(",");
+ // }
+ // this.form.prcNum = this.prcNum
+ // this.form.prcName = this.prcName
+ // this.form['id'] = item.id
+ // })
+ // },
initializeFileList(property, value) {
+ console.log(property);
switch (property) {
case 'xgd':
this.getFileList(value, this.xgdFileList);
From ec72ec55f34a2b6ccfc882e689983cf91daaa6de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 15 Apr 2022 17:31:05 +0800
Subject: [PATCH 2/4] =?UTF-8?q?52601=20=E3=80=90=E6=89=8B=E6=9C=BA?=
=?UTF-8?q?=E7=AB=AF=E3=80=91=E4=BC=81=E6=A0=87=E5=BA=9F=E6=AD=A2=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=20=E5=AE=A1=E5=AE=9A=E8=8A=82=E7=82=B9=20=E7=AC=AC6?=
=?UTF-8?q?=E6=AD=A5=20=E7=82=B9=E5=90=8C=E6=84=8F=E6=B2=A1=E5=8F=8D?=
=?UTF-8?q?=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../processCenter/pages/phone/qbfz/step6.vue | 42 ++++++++-----------
1 file changed, 18 insertions(+), 24 deletions(-)
diff --git a/src/pages/processCenter/pages/phone/qbfz/step6.vue b/src/pages/processCenter/pages/phone/qbfz/step6.vue
index 43c463069..91306a699 100644
--- a/src/pages/processCenter/pages/phone/qbfz/step6.vue
+++ b/src/pages/processCenter/pages/phone/qbfz/step6.vue
@@ -251,31 +251,25 @@ export default {
},
//流程提交
handleSubmit() {
- this.$refs['qbfsForm'].validate((valid) => {
- if (valid) {
- this.isSubmit = true;
- this.qbfsForm.commentText = this.commentText;
- this.qbfsForm.sdFlag = '0'
- this.qbfsForm.dataList = this.dataList;
- let json = JSON.stringify(this.qbfsForm);
- this.$http.post("lawss/activiti/completeTask", {
- taskIds: this.$route.query.taskIds,
- userId: this.$store.getters.userInfo.account,
- json: json
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
- }
- this.isSubmit = false;
- }, e => {
- });
- }else{
- this.$message.warning('请完善基础信息')
+ this.isSubmit = true;
+ this.qbfsForm.commentText = this.commentText;
+ this.qbfsForm.sdFlag = '0'
+ this.qbfsForm.dataList = this.dataList;
+ let json = JSON.stringify(this.qbfsForm);
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: this.$route.query.taskIds,
+ userId: this.$store.getters.userInfo.account,
+ json: json
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
}
- })
+ this.isSubmit = false;
+ }, e => {
+ });
},
handleTabs(name) {
From 27609ae887e7dd6f624a1ef6e45eade8d01dfaa4 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 15 Apr 2022 17:33:34 +0800
Subject: [PATCH 3/4] feat: There is no way the, bug #52612
---
.../domesticStandardsAndRegulations/index.vue | 127 +++++++++---------
1 file changed, 61 insertions(+), 66 deletions(-)
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 67124a799..7b1fbc7d7 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -83,18 +83,16 @@
-
-
@@ -105,7 +103,7 @@
size="mini"
class="common-button-primary"
v-btn-permission="'967c8b1402459951b5f75fcd1c548665'"
- @click="searchBtnClick(standCommonlySearch, 1)">
+ @click="searchBtnClick(sarStandardsSearch, 1)">
查询
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1634,6 +1640,14 @@
placeholder="根据标准年份查找">
+
+
+
+ {{ opt.label }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1696,13 +1686,21 @@
placeholder="根据标准发布日期查找">
-
-
-
- {{ opt.label }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3720,11 +3718,11 @@ export default {
this.sarStandardsSearch.page = 1
this.standCommonlySearch.page = 1
//搜索后点击属性菜单依然显示搜索条件的数据
- this.getDomesticStandardTable(this.standCommonlySearch)
+ this.getDomesticStandardTable(this.sarStandardsSearch)
},
// 点击搜索按钮
- searchBtnClick(standCommonlySearch, type) {
- let item = this.standCommonlySearch
+ searchBtnClick(sarStandardsSearch, type) {
+ let item = this.sarStandardsSearch
this.getDomesticStandardTable(item, type)
},
// 搜索
@@ -3798,10 +3796,10 @@ export default {
this.sarStandardsSearch.category = ''
this.isAdvancedSearch = false
// } else if (flag === 'standCommonlySearch') {
- this.standCommonlySearch.standName = ''
- this.standCommonlySearch.standNumber = ''
+ this.sarStandardsSearch.standName = ''
+ this.sarStandardsSearch.standNumber = ''
this.pageChange(1)
- this.getDomesticStandardTable(this.standCommonlySearch)
+ this.getDomesticStandardTable(this.sarStandardsSearch)
} else if (flag === 2) {
// 标准条目搜索
this.standItemSearch.responsibleUnit = ''
@@ -4524,35 +4522,35 @@ export default {
},
// 分页点击后方法
pageChange(page) {
+ debugger
if (this.tableFlag !== '') {
this.tableFlag.page = page
} else {
this.sarStandardsSearch.page = page
}
- this.standCommonlySearch.page = page
- this.standCommonlySearch.pageNo = 1
- if (this.sarStandardsSearch.standNumber !== '' || this.sarStandardsSearch.standName !== '') {
- this.getDomesticStandardTable(this.sarStandardsSearch)
- } else {
- this.getDomesticStandardTable(this.standCommonlySearch)
- }
-
+ this.sarStandardsSearch.page = page
+ this.getDomesticStandardTable(this.sarStandardsSearch)
},
// 分页每页显示数改变后方法
pageSizeChange(pageSize) {
+ debugger
this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
let tabFlag = JSON.parse(sessionStorage.getItem('tableFlag'))
- this.getDomesticStandardTable(tabFlag)
+ if (tabFlag !== '') {
+ this.sarStandardsSearch.page = tabFlag.page
+ }
+ this.getDomesticStandardTable(this.sarStandardsSearch)
this.selectConfiguraStand()
// 此处需要调用接口，修改个人配置
},
// 分页查询国内标准
getDomesticStandardTable(item, type) {
+ debugger
if (item !== '' && item !== null && item !== undefined) {
item.pageSize = this.$store.getters.userInfo.configContent
}
this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
- const data = item || this.sarStandardsSearch || this.advanceSearchMapping
+ const data = item || this.sarStandardsSearch || this.advanceSearchMapping || this.standCommonlySearch
if (item) {
this.sarStandardsSearch.advanceSearchStr = item.advanceSearchStr
}
@@ -4670,9 +4668,6 @@ export default {
if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) {
this.pageChange(1)
}
- if (type === 1) {
- this.sarStandardsSearch = {}
- }
} else {
this.$message.error(res.message)
}
From 4f18c33fabf7a630719aa702b41d576b1e8603c4 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 15 Apr 2022 17:41:55 +0800
Subject: [PATCH 4/4] feat: There is no way the, del dubug
---
.../domesticStandardsAndRegulations/index.vue | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 7b1fbc7d7..2738ed61f 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -4522,7 +4522,6 @@ export default {
},
// 分页点击后方法
pageChange(page) {
- debugger
if (this.tableFlag !== '') {
this.tableFlag.page = page
} else {
@@ -4533,7 +4532,6 @@ export default {
},
// 分页每页显示数改变后方法
pageSizeChange(pageSize) {
- debugger
this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
let tabFlag = JSON.parse(sessionStorage.getItem('tableFlag'))
if (tabFlag !== '') {
@@ -4545,7 +4543,6 @@ export default {
},
// 分页查询国内标准
getDomesticStandardTable(item, type) {
- debugger
if (item !== '' && item !== null && item !== undefined) {
item.pageSize = this.$store.getters.userInfo.configContent
}