-
{{ getPrcNameFilter(item) }}
-
- {{ getPrcNameFilter(item).substring(0, 32) + '...' }}
-
+
+ {{ getPrcNameFilter(item) }}
+
+
+
+
From 74366493c0196e2c6406d80e1757be52e6a902d5 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Tue, 19 Apr 2022 10:24:06 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052600=20=E4=BC=81?=
=?UTF-8?q?=E6=A0=87=E8=AE=A1=E5=88=92-=E6=96=B0=E5=A2=9E=20=E8=BE=93?=
=?UTF-8?q?=E5=85=A5=E5=AE=8C=E8=B4=A3=E4=BB=BB=E5=8D=95=E4=BD=8D=E4=BA=86?=
=?UTF-8?q?=20=E8=BF=98=E6=9C=89=E7=BA=A2=E8=89=B2=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../enterpriseStandardPlan/index.vue | 30 +++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index fa068aab2..7dd20272b 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -809,7 +809,7 @@
{required: true, message: '请选择起草人', trigger: 'change'},
],
rqbJson: [
- {required: true, message: '请选择代替企标编号', trigger: 'change'},
+ {required: false, message: '请选择代替企标编号', trigger: ['change', 'blur']},
]
},
form: {
@@ -1038,6 +1038,7 @@
}
this.addForm.unit = list
this.addForm.unitName = listName
+ this.$refs.addForm.validateField('unitName')
this.modalshowflagZRBM = false
},
choiceZRBM(id) {
@@ -1161,7 +1162,32 @@
},
addData () {
this.addDrawerTitle = '新增'
- this.addForm = {}
+ this.addForm = {
+ bussSort:'',
+ esMatingRelations: '',
+ technologic: '',
+ useLevel: '',
+ isRelate: '',
+ esStandRelations: '',
+ area: [],
+ tsJson: '',
+ tsJsonName: '',
+ rqbJson: '',
+ rqbName: '',
+ unit: '', // 单位
+ unitName: '',
+ esName: '', // 企标名称
+ planStatus: '', // 计划状态
+ reviseStatus: '', // 制修订状态
+ resPerson: '', // 评审责任人
+ resPersonName: '',
+ wgLeader: '', // 工作组组长
+ wgLeaderName: '',
+ draftTime: '', // 计划标准初稿完成时间
+ releaseTime: '', // 计划标准发布时间
+ drafter: '', // 起草人
+ drafterName: ''
+ }
this.DrawerType = 'add'
this.addForm.planStatus = '0'
this.addDrawer = true
From e35ad1a39fcc92599b1e85ac3c8ea92823229820 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Tue, 19 Apr 2022 10:26:31 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index b3389d5ff..ec130c6a5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -533,7 +533,7 @@ export default {
BDmodel: false,
PLmodalType: '',
PLmodalIndex: '',
- PLmodalshowflag: true,
+ PLmodalshowflag: false,
PLmodalTitle: '',
plForm: {
itemsNum: '',
From d24b00baeef19c2c388dc65bed3f094f2b21f48a Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Tue, 19 Apr 2022 10:56:30 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052605=20=E6=9C=AA?=
=?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9-=E6=93=8D=E4=BD=9C=E5=88=97?=
=?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E6=A0=87=E5=87=86=E5=8F=B7=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=90=8E=E7=AB=AF=E6=9F=A5?=
=?UTF-8?q?=E5=88=B0=E4=BA=86=EF=BC=8C=E5=89=8D=E7=AB=AF=E6=B2=A1=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../nonConfomity/pages/rectificationDatabase.vue | 1 +
1 file changed, 1 insertion(+)
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(){
From 6ae0472109f30eb9c9e8a5723c08a5f231bcceb6 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Tue, 19 Apr 2022 15:21:39 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052615=20=E5=BE=81?=
=?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E5=AE=8C=E6=88=90=E5=90=8E=20=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E9=9C=80=E8=A6=81=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=20?=
=?UTF-8?q?=E7=8E=B0=E5=9C=A8=E6=98=AF=E6=89=8B=E5=8A=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main.js | 3 ++-
.../pags/consultationDetails.vue | 24 ++++++++++++++++++-
src/utils/tool.js | 13 ++++++++++
3 files changed, 38 insertions(+), 2 deletions(-)
create mode 100644 src/utils/tool.js
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/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
+
From ced5c03807c3947382daddb50e30f5f68bff3ade Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Tue, 19 Apr 2022 16:01:32 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052488=20=E6=A0=87?=
=?UTF-8?q?=E5=87=86=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B=EF=BC=9A=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E5=8F=91=E8=B5=B7=20=E6=95=B0=E6=8D=AE=E4=BF=9D?=
=?UTF-8?q?=E5=AD=98=E5=90=8E=E5=9C=A8=E8=8D=89=E7=A8=BF=E7=95=8C=E9=9D=A2?=
=?UTF-8?q?=E4=B8=AD=20=E5=BF=85=E5=A1=AB=E9=A1=B9=E4=B8=A2=E5=A4=B1?=
=?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=95=B0=E6=8D=AEUI=E4=B9=9F?=
=?UTF-8?q?=E9=94=99=E4=B9=B1=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 3 +++
1 file changed, 3 insertions(+)
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