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);
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) {
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 7d920a155..b0a821226 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -84,18 +84,16 @@
-
-
@@ -106,7 +104,7 @@
size="mini"
class="common-button-primary"
v-btn-permission="'967c8b1402459951b5f75fcd1c548665'"
- @click="searchBtnClick(standCommonlySearch, 1)">
+ @click="searchBtnClick(sarStandardsSearch, 1)">
查询
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1635,6 +1641,14 @@
placeholder="根据标准年份查找">
+
+
+
+ {{ opt.label }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1697,13 +1687,21 @@
placeholder="根据标准发布日期查找">
-
-
-
- {{ opt.label }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3721,11 +3719,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)
},
// 搜索
@@ -3799,10 +3797,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 = ''
@@ -4530,20 +4528,17 @@ export default {
} 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) {
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()
// 此处需要调用接口，修改个人配置
},
@@ -4553,7 +4548,7 @@ export default {
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
}
@@ -4671,9 +4666,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)
}