From 9cff5a507063a6be443ef1ca9d9325f8091003bf Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Thu, 29 Jul 2021 16:59:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=E6=B8=85=E7=A9=BA=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E9=A1=B5?=
=?UTF-8?q?=E7=9A=84=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/localTool/standAutoSplit/index.vue | 38 +--
.../standAutoSplit/pages/itemSplitInfo.vue | 10 +-
.../localTool/standardRecognition/index.vue | 306 +++++++++---------
.../page/listOfCountries.vue | 6 +-
.../page/listOther.vue | 6 +-
.../page/listProject.vue | 6 +-
.../pages/addEdit.vue | 8 +-
.../pages/details.vue | 12 +-
.../pages/otherAddEit.vue | 8 +-
.../pages/projectAddEit.vue | 8 +-
10 files changed, 190 insertions(+), 218 deletions(-)
diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index e4306b6ee..3f07616db 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -51,20 +51,12 @@
prop="showNumber"
label="标准号/政策号"
align="center">
-
- {{ scope.row.standNumSplit }}
- {{ scope.row.showNumber }}
-
-
- {{ scope.row.standNameSplit }}
- {{ scope.row.standName }}
-
-
-
- {{ scope.row.splitStatus == '0' ? '编辑中' : (scope.row.splitStatus == '1' ? '审核中' : '已完成' +
- '') }}
-
-
+
+ {{ scope.row.creationTime ? $moment(scope.row.creationTime).format('YYYY-MM-DD') : '' }}
+
失败
-
+
查看
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
删除
diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index 7c38fa00b..a4035fe21 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -2245,15 +2245,7 @@ export default {
})
},
jurisdictionCheck() {
- if (this.jurisdiction === '0') {
- this.$message.warning('审核中，不可操作')
- return false
- } else if (this.jurisdiction === '1') {
- this.$message.warning('编辑中，不可操作')
- return false
- } else {
- return true
- }
+ return true
}
},
props: {},
diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index f4ece4368..47590915f 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/src/pages/localTool/standardRecognition/index.vue
@@ -291,158 +291,158 @@ export default {
label: "关联文件",
},
],
- // standRecoColumn: [
- // {
- // type: 'selection',
- // width: 60,
- // align: 'center'
- // },
- // {
- // title: '序号',
- // type: 'index',
- // align: 'center'
- // },
- // {
- // title: '资料类型',
- // key: 'fileType',
- // align: 'center',
- // render: (h, params) => {
- // let texts
- // if (params.row.fileType === '1') {
- // texts = '国内标准法规'
- // } else if (params.row.fileType === '2') {
- // texts = '海外标准法规'
- // } else if (params.row.fileType === '3') {
- // texts = '政策'
- // } else if (params.row.fileType === '4') {
- // texts = '企业标准'
- // } else {
- // texts = '标准'
- // }
- // return h('div', {
- // class: {
- // 'text-overflow-hidden': true
- // },
- // attrs: {
- // title: texts
- // }
- // }, texts)
- // }
- // },
- // {
- // title: '标准号/政策号',
- // key: 'standNumber',
- // align: 'center'
- // },
- // {
- // title: '标准名称/政策名称',
- // key: 'standName',
- // align: 'center'
- // },
- // {
- // title: '文本状态',
- // key: 'fileStatus',
- // align: 'center',
- // render: (h, params) => {
- // let texts
- // if (params.row.fileType === 'STAND_FILE') {
- // texts = '标准文本'
- // } else if (params.row.fileType === 'DRAFT_FILE') {
- // texts = '草案'
- // } else if (params.row.fileType === 'OPINION_FILE') {
- // texts = '征求意见稿'
- // } else if (params.row.fileType === 'SENT_SCREEN_FILE') {
- // texts = '送审稿'
- // } else if (params.row.fileType === 'APPROVAL_FILE') {
- // texts = '报批稿'
- // } else if (params.row.fileType === 'RELEVANCE_FILE') {
- // texts = '关联文件'
- // }
- // return h('div', {
- // class: {
- // 'text-overflow-hidden': true
- // },
- // attrs: {
- // title: texts
- // }
- // }, texts)
- // }
- // },
- // {
- // title: '转换结果',
- // key: 'resultContent',
- // align: 'center'
- // },
- // {
- // title: '消耗时间',
- // key: 'spendTime',
- // align: 'center'
- // },
- // {
- // title: '操作',
- // key: 'action',
- // width: 200,
- // align: 'center',
- // render: (h, params) => {
- // return h('div', [
- // h('Button', {
- // props: {
- // type: 'primary',
- // size: 'small'
- // },
- // style: {
- // marginRight: '5px'
- // },
- // on: {
- // click: () => {
- // this.downloadFile(params.row)
- // }
- // }
- // }, '获取文件'),
- // h('Button', {
- // props: {
- // type: 'warning',
- // size: 'small'
- // },
- // style: {
- // marginRight: '5px'
- // },
- // on: {
- // click: () => {
- // this.editOcrRecord(params.row)
- // }
- // }
- // }, '编辑'),
- // h('Dropdown', {
- // props: {
- // trigger: 'click'
- // },
- // on: {
- // 'on-click': (value) => {}
- // }
- // }, [
- // h('Button', {
- // props: {
- // type: 'primary',
- // size: 'small'
- // }
- // }, '更多'),
- // h('DropdownMenu', {
- // slot: 'list'
- // },
- // this.dropdownItems.map(function (type) {
- // return h('DropdownItem', {
- // props: {
- // name: type.val
- // }
- // }, type.val)
- // })
- // )
- // ])
- // ])
- // }
- // }
- // ],
+/* standRecoColumn: [
+ {
+ type: 'selection',
+ width: 60,
+ align: 'center'
+ },
+ {
+ title: '序号',
+ type: 'index',
+ align: 'center'
+ },
+ {
+ title: '资料类型',
+ key: 'fileType',
+ align: 'center',
+ render: (h, params) => {
+ let texts
+ if (params.row.fileType === '1') {
+ texts = '国内标准法规'
+ } else if (params.row.fileType === '2') {
+ texts = '海外标准法规'
+ } else if (params.row.fileType === '3') {
+ texts = '政策'
+ } else if (params.row.fileType === '4') {
+ texts = '企业标准'
+ } else {
+ texts = '标准'
+ }
+ return h('div', {
+ class: {
+ 'text-overflow-hidden': true
+ },
+ attrs: {
+ title: texts
+ }
+ }, texts)
+ }
+ },
+ {
+ title: '标准号/政策号',
+ key: 'standNumber',
+ align: 'center'
+ },
+ {
+ title: '标准名称/政策名称',
+ key: 'standName',
+ align: 'center'
+ },
+ {
+ title: '文本状态',
+ key: 'fileStatus',
+ align: 'center',
+ render: (h, params) => {
+ let texts
+ if (params.row.fileType === 'STAND_FILE') {
+ texts = '标准文本'
+ } else if (params.row.fileType === 'DRAFT_FILE') {
+ texts = '草案'
+ } else if (params.row.fileType === 'OPINION_FILE') {
+ texts = '征求意见稿'
+ } else if (params.row.fileType === 'SENT_SCREEN_FILE') {
+ texts = '送审稿'
+ } else if (params.row.fileType === 'APPROVAL_FILE') {
+ texts = '报批稿'
+ } else if (params.row.fileType === 'RELEVANCE_FILE') {
+ texts = '关联文件'
+ }
+ return h('div', {
+ class: {
+ 'text-overflow-hidden': true
+ },
+ attrs: {
+ title: texts
+ }
+ }, texts)
+ }
+ },
+ {
+ title: '转换结果',
+ key: 'resultContent',
+ align: 'center'
+ },
+ {
+ title: '消耗时间',
+ key: 'spendTime',
+ align: 'center'
+ },
+ {
+ title: '操作',
+ key: 'action',
+ width: 200,
+ align: 'center',
+ render: (h, params) => {
+ return h('div', [
+ h('Button', {
+ props: {
+ type: 'primary',
+ size: 'small'
+ },
+ style: {
+ marginRight: '5px'
+ },
+ on: {
+ click: () => {
+ this.downloadFile(params.row)
+ }
+ }
+ }, '获取文件'),
+ h('Button', {
+ props: {
+ type: 'warning',
+ size: 'small'
+ },
+ style: {
+ marginRight: '5px'
+ },
+ on: {
+ click: () => {
+ this.editOcrRecord(params.row)
+ }
+ }
+ }, '编辑'),
+ h('Dropdown', {
+ props: {
+ trigger: 'click'
+ },
+ on: {
+ 'on-click': (value) => {}
+ }
+ }, [
+ h('Button', {
+ props: {
+ type: 'primary',
+ size: 'small'
+ }
+ }, '更多'),
+ h('DropdownMenu', {
+ slot: 'list'
+ },
+ this.dropdownItems.map(function (type) {
+ return h('DropdownItem', {
+ props: {
+ name: type.val
+ }
+ }, type.val)
+ })
+ )
+ ])
+ ])
+ }
+ }
+ ],*/
modalType: "",
standRecoList: [],
selectTableData: [],
@@ -759,7 +759,7 @@ export default {
(res) => {
if (res.ok) {
this.standRecoList = res.data.list;
- this.total = res.data.count;
+ this.total = res.data.list.length;
}
},
e => {}
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index f2c52fcc1..c4cfc9b43 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -267,16 +267,16 @@ export default {
},
pageChange(page) {
this.sarSarAccessEOSearch.page = page;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
pageSizeChange(pageSize) {
this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
clearSearch() {
this.sarSarAccessEOSearch.countryArea = ''
this.sarSarAccessEOSearch.detailedListName = ''
- this.searchSarAccess();
+ // this.searchSarAccess();
},
// 新增相关
openModal(row, optType) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index 1340cb86d..b0af84fa9 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -283,16 +283,16 @@ export default {
},
pageChange(page) {
this.sarSarAccessEOSearch.page = page;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
pageSizeChange(pageSize) {
this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
clearSearch() {
this.sarSarAccessEOSearch.detailedList = ''
this.sarSarAccessEOSearch.detailedListName = ''
- this.searchSarAccess();
+ // this.searchSarAccess();
},
// 新增相关
openModal(row, optType) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index 9cb9ccc1f..d45f42401 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -283,17 +283,17 @@ export default {
},
pageChange(page) {
this.sarSarAccessEOSearch.page = page;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
pageSizeChange(pageSize) {
this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
//清空
clearSearch() {
this.sarSarAccessEOSearch.projectName = ''
this.sarSarAccessEOSearch.detailedListName = ''
- this.searchSarAccess()
+ // this.searchSarAccess()
},
// 新增相关
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 2c860654c..4a89f62c4 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1176,6 +1176,7 @@ export default {
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
+ this.$message.warning('请勿添加重复数据')
} else{
this.sarAccessInfoList.push(item)
// this.$refs.accessTypeSelect.clearSelection()
@@ -1183,7 +1184,6 @@ export default {
this.$refs.searchTable.clearSelection()
}
})
- this.$message.warning('请勿添加重复数据')
} else {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
}
@@ -1295,17 +1295,17 @@ export default {
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null) {
- rowlist1.push(this.sarAccessInfoList[i].putTime = '')
+ rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
- rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '')
+ rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
}else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
if (this.sarAccessInfoList[i].zccssrqgj === null) {
- rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '')
+ rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
}else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
}
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 674ab98bd..a55938830 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -381,7 +381,7 @@ export default {
heightShow: true,
dataLoading: false,
standardForm: {
-
+ zrbm: '',
standNumber: "",
standName: "",
responseUnit: "",
@@ -389,6 +389,10 @@ export default {
Size: this.$store.getters.userInfo.configContent
},
standardFormList: {
+ zrbm: '',
+ typeApplicable: '',
+ nylx: '',
+ sycpx: '',
standNumber: '',
standName: '',
responseUnit: '',
@@ -493,8 +497,14 @@ export default {
},
// 重置搜索
resetSelect() {
+ this.standardForm.zrbm = ''
this.standardForm.standName = ''
this.standardForm.responseUnit = ''
+ this.standardFormList.standName = ''
+ this.standardFormList.typeApplicable = ''
+ this.standardFormList.nylx = ''
+ this.standardFormList.zrbm = ''
+ this.standardFormList.sycpx = ''
this.selectInfobyAccid()
},
exportStandard() {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 4a1bebbc0..76a9f2f86 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -1145,6 +1145,7 @@ export default {
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
+ this.$message.warning('请勿添加重复数据')
} else{
this.sarAccessInfoList.push(item)
// this.$refs.accessTypeSelect.clearSelection()
@@ -1152,7 +1153,6 @@ export default {
this.$refs.searchTable.clearSelection()
}
})
- this.$message.warning('请勿添加重复数据')
this.selectedAccInfoSearchList = []
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
@@ -1264,17 +1264,17 @@ export default {
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null) {
- rowlist1.push(this.sarAccessInfoList[i].putTime = '')
+ rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
- rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '')
+ rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
}else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
if (this.sarAccessInfoList[i].zccssrqgj === null) {
- rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '')
+ rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
}else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
}
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 8adf94499..1d4fe3bc6 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -1144,6 +1144,7 @@ export default {
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
+ this.$message.warning('请勿添加重复数据')
} else{
this.sarAccessInfoList.push(item)
// this.$refs.accessTypeSelect.clearSelection()
@@ -1151,7 +1152,6 @@ export default {
this.$refs.searchTable.clearSelection()
}
})
- this.$message.warning('请勿添加重复数据')
this.selectedAccInfoSearchList = []
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
@@ -1263,17 +1263,17 @@ export default {
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null) {
- rowlist1.push(this.sarAccessInfoList[i].putTime = '')
+ rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
- rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '')
+ rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
}else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
if (this.sarAccessInfoList[i].zccssrqgj === null) {
- rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '')
+ rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
}else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
}