diff --git a/src/pages/personal/pages/my-questions/components/questionDetail.vue b/src/pages/personal/pages/my-questions/components/questionDetail.vue
index 973f33b00..f284d082f 100644
--- a/src/pages/personal/pages/my-questions/components/questionDetail.vue
+++ b/src/pages/personal/pages/my-questions/components/questionDetail.vue
@@ -40,7 +40,7 @@ export default {
},
methods:{
back() {
- this.$router.push({path: "/questions"});
+ this.$router.go(-1)
},
getDetail(){
this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue
index 7deebf9bc..f722b06e7 100644
--- a/src/pages/phone/domesticDetails.vue
+++ b/src/pages/phone/domesticDetails.vue
@@ -74,6 +74,46 @@
@@ -300,7 +340,7 @@
@@ -1805,6 +1845,14 @@
}
return child5
},
+ child6Func(child6) {
+ const list = []
+ if (child6 && child6.length > 1) {
+ list.push(child6[0])
+ return list
+ }
+ return child6
+ },
handleChange(val) {
},
handleChange1(val) {
@@ -3355,6 +3403,14 @@
location['child5'] = childList
}
+ //修订本
+ if (!list[0].child) {
+ location['child6'] = []
+ } else {
+ const childList = list[0].child.filter(item => item.attrField === 'FBGYWBD');
+ location['child6'] = childList
+
+ }
}
// 动态属性字段-SYRZ 单独添加至基础信息
const list2 = displayLocation.filter(item => item.label === '适用范围');
diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue
index fbb9c77cc..664d20fab 100644
--- a/src/pages/processCenter/pages/phone/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue
@@ -166,6 +166,14 @@
- -
+
+
+ {{ value.name }}
+
+
+ - -
+
+
{{ value.name }}
@@ -455,6 +463,7 @@ export default {
textStatusMap: {}, // 文本状态id与name对应
xgdFileMap: [],
fbgbjbdFileMap: [],
+ fbgywbdFileMap: [],
bpgFileMap: [],
ssgFileMap: [],
zqyjgFileMap: [],
@@ -531,6 +540,7 @@ export default {
// 文本信息
ca: '', // 草案
fbgbjbd: '', // 发布稿
+ fbgywbd: '', // 发布稿 译文
xgd: '', // 修改单
bpg: '', // 报批稿
ssg: '', // 送审稿
@@ -541,6 +551,7 @@ export default {
kwj: '', // 勘误件
caName: '', // 草案
fbgbjbdName: '', // 发布稿
+ fbgywbdName: '', // 发布稿 译文
xgdName: '', // 修改单
bpgName: '', // 报批稿
ssgName: '', // 送审稿
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 8284a2c05..946dd1e0c 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -5472,7 +5472,8 @@ export default {
loading: 'isSubmit'
}, res => {
if (res.ok) {
- this.configStandFlag = false
+ this.cancelConfigStand()
+ // this.configStandFlag = false
// this.$message({
// showClose: true,
// message: '配置标准成功!',
diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue
index af377a32e..ea47b938a 100644
--- a/src/pages/regulatoryRepository/standQA/index.vue
+++ b/src/pages/regulatoryRepository/standQA/index.vue
@@ -720,15 +720,21 @@ export default {
//点击跳转问题详情
historyJump(item){
this.$router.push({
- path: '/standQA',
- query:{
- standId: item.standardId,
- queId: item.id,
- sourceType: 'dialog',
- standType: item.classification,
- standName: item.standardName,
+ path: "/questionDetail",
+ query: {
+ id: item.id
}
- })
+ });
+ // this.$router.push({
+ // path: '/standQA',
+ // query:{
+ // standId: item.standardId,
+ // queId: item.id,
+ // sourceType: 'dialog',
+ // standType: item.classification,
+ // standName: item.standardName,
+ // }
+ // })
this.dialogVisible = false
},
// 点击查看