diff --git a/src/main.js b/src/main.js
index a2c5adf76..803cf9d99 100644
--- a/src/main.js
+++ b/src/main.js
@@ -46,7 +46,8 @@ import 'vant/lib/index.css';
//vant
import animate from 'animate.css'
-
+import tool from './utils/tool'
+Vue.use(tool)
// 引入路由器
import router from './router'
// 路由解析器
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index ec130c6a5..9dbaa8b71 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -1037,6 +1037,9 @@ export default {
},
handleTabs(name) {
this.active = name
+ this.$nextTick(()=>{
+ this.$refs.filterTable.doLayout()
+ })
},
handleSave() {
this.saveLoading = true
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 44dfe6258..61c810c95 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -26,30 +26,33 @@
{{ node.label }}
-
-
+
+
+ 新增
+
+
+ 编辑
+
+
+ 删除
+
+
+
@@ -2288,7 +2291,6 @@ export default {
parentIds: null,
parentIdsName: "",
displaySeq: "",
- validFlag: "",
creationTime: "",
modifyTime: "",
remarks: "",
@@ -3620,11 +3622,16 @@ export default {
if (row.parentIds.indexOf(res.data.id) != -1) {
this.productModelAdd.parentIds = row.parentIds
} else {
- this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id
- idsName = row.parentIdsName + ',' + res.data.menuName
+ if(row.parentIds && row.parentIds.substr(-1,1) === ','){
+ this.productModelAdd.parentIds = row.parentIds + res.data.id+','
+ idsName = row.parentIdsName + ',' + res.data.menuName
+ }else {
+ this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id+','
+ idsName = row.parentIdsName + ',' + res.data.menuName
+ }
}
} else {
- this.productModelAdd.parentIds = res.data.id
+ this.productModelAdd.parentIds = ','+res.data.id+','
idsName = res.data.menuName;
}
this.productModelAdd.parentId = res.data.id
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 4720b184e..e4a63f07e 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -25,29 +25,32 @@
{{ node.label }}
-
+
+
+ 新增
+
+
+ 编辑
+
+
+ 删除
+
+
@@ -1756,13 +1759,12 @@ export default {
},
productModelAdd: {
id: "",
- sorDivide: "INLAND_STAND",
+ sorDivide: "BUSINESS_STAND",
menuName: "",
parentId: null,
parentIds: null,
parentIdsName: "",
displaySeq: "",
- validFlag: "",
creationTime: "",
modifyTime: "",
remarks: "",
@@ -2797,7 +2799,7 @@ export default {
_this: this
}, res => {
if (res.ok) {
- this.selectMenuList()
+ this.selectMenuListNew()
this.productModal = false
this.productModelAdd = {
// 模态框信息
@@ -2817,7 +2819,7 @@ export default {
this.$http.putData('sarResource/ts-resource', this.productModelAdd, {
_this: this
}, res => {
- this.selectMenuList()
+ this.selectMenuListNew()
this.productModal = false
this.productModelAdd = {
// 模态框信息
@@ -2851,6 +2853,18 @@ export default {
this.productModal = false
},
// 查询二级菜单
+ selectMenuListNew() {
+ return new Promise((resolve, reject) => {
+ this.$http.get('sarResource/ts-resource/getListStandLimitData', {
+ sorDivide: 'BUSINESS_STAND',
+ userId: this.$store.getters.userInfo.userId
+ }, {
+ _this: this
+ }, res => {
+ this.treeList = res.data
+ })
+ })
+ },
selectMenuList() {
return new Promise((resolve, reject) => {
this.$http.get('sarResource/ts-resource/getListStandLimitData', {
@@ -2886,11 +2900,16 @@ export default {
if (row.parentIds.indexOf(res.data.id) != -1) {
this.productModelAdd.parentIds = row.parentIds
} else {
- this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id
- idsName = row.parentIdsName + ',' + res.data.menuName
+ if(row.parentIds && row.parentIds.substr(-1,1) === ','){
+ this.productModelAdd.parentIds = row.parentIds + res.data.id+','
+ idsName = row.parentIdsName + ',' + res.data.menuName
+ }else {
+ this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id+','
+ idsName = row.parentIdsName + ',' + res.data.menuName
+ }
}
} else {
- this.productModelAdd.parentIds = res.data.id
+ this.productModelAdd.parentIds = ','+res.data.id+','
idsName = res.data.menuName;
}
this.productModelAdd.parentId = res.data.id
@@ -2945,7 +2964,7 @@ export default {
message: "删除成功"
})
this.getBussionStandTable()
- this.selectMenuList()
+ this.selectMenuListNew()
} else {
this.$message({
type: 'warning',
@@ -2967,9 +2986,14 @@ export default {
},
// 树节点鼠标移入移出
mouseenter(data) {
- this.$set(data, 'show', true)
- if (data.parentId !== null) {
- this.$set(data, 'showDel', true)
+ if(data && data.treeType && data.treeType === 'sarMs'){
+ this.$set(data, 'show', false)
+ this.$set(data, 'showDel', false)
+ }else {
+ this.$set(data, 'show', true)
+ if (data.parentId !== null) {
+ this.$set(data, 'showDel', true)
+ }
}
},
mouseleave(data) {
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index 2d5f01f0b..b1c7c7bbc 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -30,6 +30,7 @@
type="text"
size="mini"
v-show="data.show"
+ v-btn-permission="'a3109949cc30dae1ef523c037b2651b8'"
@click="() => append(data)">
新增
@@ -37,6 +38,7 @@
type="text"
size="mini"
v-show="data.show"
+ v-btn-permission="'61a33c05ed689934f7d4a0de4220c9ce'"
@click="() => update(data)">
编辑
@@ -44,6 +46,7 @@
type="text"
size="mini"
v-show="data.showDel"
+ v-btn-permission="'b123231eb8c42b2a61e3dc5f59654f79'"
@click="() => remove(node, data)">
删除
@@ -1434,7 +1437,6 @@
parentIds : null,
parentIdsName : "",
displaySeq : "",
- validFlag : "0",
creationTime : "",
modifyTime : "",
remarks : "",
@@ -2360,15 +2362,20 @@
if (res.ok) {
if(this.modalType === 1){
let idsName = ""
- if(row.parentIds !== null){
- if(row.parentIds.indexOf(res.data.id) != -1){
+ if (row.parentIds !== null) {
+ if (row.parentIds.indexOf(res.data.id) != -1) {
this.productModelAdd.parentIds = row.parentIds
- }else {
- this.productModelAdd.parentIds = row.parentIds + res.data.id+','
- idsName = row.parentIdsName + ',' + res.data.menuName
+ } else {
+ if(row.parentIds && row.parentIds.substr(-1,1) === ','){
+ this.productModelAdd.parentIds = row.parentIds + res.data.id+','
+ idsName = row.parentIdsName + ',' + res.data.menuName
+ }else {
+ this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id+','
+ idsName = row.parentIdsName + ',' + res.data.menuName
+ }
}
- }else {
- this.productModelAdd.parentIds = +','+res.data.id+','
+ } else {
+ this.productModelAdd.parentIds = ','+res.data.id+','
idsName = res.data.menuName;
}
this.productModelAdd.parentId = res.data.id
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index e77d5a75d..fbf22edd2 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -24,29 +24,32 @@
{{ node.label }}
-
+
+
+ 新增
+
+
+ 编辑
+
+
+ 删除
+
+
@@ -2272,7 +2275,6 @@ export default {
parentIds: null,
parentIdsName: "",
displaySeq: "",
- validFlag: "",
creationTime: "",
modifyTime: "",
remarks: "",
@@ -3041,11 +3043,16 @@ export default {
if (row.parentIds.indexOf(res.data.id) != -1) {
this.productModelAdd.parentIds = row.parentIds
} else {
- this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id
- idsName = row.parentIdsName + ',' + res.data.menuName
+ if(row.parentIds && row.parentIds.substr(-1,1) === ','){
+ this.productModelAdd.parentIds = row.parentIds + res.data.id+','
+ idsName = row.parentIdsName + ',' + res.data.menuName
+ }else {
+ this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id+','
+ idsName = row.parentIdsName + ',' + res.data.menuName
+ }
}
} else {
- this.productModelAdd.parentIds = res.data.id
+ this.productModelAdd.parentIds = ','+res.data.id+','
idsName = res.data.menuName;
}
this.productModelAdd.parentId = res.data.id
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 7ec42cb0f..2a9d1ff43 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -896,6 +896,7 @@ export default {
},
showStand(){
this.dialogTableVisible = true
+ this.getStandDataBtn()
},
//标准查询按钮
getStandDataBtn(){
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 89cb9de04..c1c1e7514 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -388,6 +388,7 @@ export default {
console.log(res.data.records);
this.total = res.data.total
this.spinShow = false
+ localStorage.setItem('refreshFlag', false)
}, e => {
})
},
@@ -557,6 +558,13 @@ export default {
},
handleQueryPdf(file){
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.attId))
+ },
+ isVisible(e) {
+ if (e.target.visibilityState === "visible") {
+ this.getList()
+ } else if (e.target.visibilityState === "hidden") {
+ this.getList()
+ }
}
},
watch: {
@@ -572,6 +580,17 @@ export default {
...mapGetters(['refreshFlag'])
},
mounted() {
+ const that = this;
+ //监听缓存中指定key的值变化
+ window.addEventListener("setItemEvent",function(e){
+ //e.key : 是值发生变化的key
+ //例如 e.key==="token";
+ //e.newValue : 是可以对应的新值
+ if(e.key === "refreshFlag" && e.newValue === true){
+ this.getList()
+ }
+ })
+ document.addEventListener('visibilitychange', that.isVisible)
if (this.lawsStand) {
this.form = {
ideaId: this.lawsStand.id,
@@ -613,7 +632,10 @@ export default {
this.getList()
this.getIdeaKey()
this.getFileInfo()
- }
+ },
+ destroyed() {
+ document.removeEventListener('visibilitychange', this.isVisible)
+ },
}
diff --git a/src/utils/tool.js b/src/utils/tool.js
new file mode 100644
index 000000000..2efd74a93
--- /dev/null
+++ b/src/utils/tool.js
@@ -0,0 +1,13 @@
+function dispatchEventStroage() {
+ const signSetItem = localStorage.setItem
+ localStorage.setItem = function(key, val) {
+ let setEvent = new Event('setItemEvent')
+ setEvent.key = key
+ setEvent.newValue = val
+ window.dispatchEvent(setEvent)
+ signSetItem.apply(this, arguments)
+ }
+}
+
+export default dispatchEventStroage
+